Merge branch 'master' into npm

README.md

@@ -6,7 +6,7 @@
 
 ## 主要区别
 
-- 去除了 Redis，发送的图片会在本地缓存（请视情况删除）
+- 去除了 Redis
 - 图片使用 [sharp](https://github.com/lovell/sharp) 压缩为 JPEG
 - 机器人的 QQ 号码必须手动填写
 
@@ -19,13 +19,13 @@
 | mirai_access_token | Mirai HTTP API authKey（需保持和插件一致，插件在未配置对应<br />项目时会在 console 给出当前设定值，请将该值填在此处） | （必填） |
 | mirai_http_host | Mirai HTTP API 插件服务端地址 | 127.0.0.1 |
 | mirai_http_port | Mirai HTTP API 插件服务端口 | 8080 |
-| mirai_http_base_dir | Mirai HTTP API 插件起始目录，图片会保存到此目录下的 /images <br />文件夹中。默认设定认为用户已将本应用安装到同一目录下 | .（本应用的工作目录） |
 | mirai_bot_qq | Mirai HTTP API 登录的目标机器人 QQ 号 | 10000（示例值，必填） |
 | twitter_consumer_key | Twitter App consumer_key | （必填） |
 | twitter_consumer_secret |  Twitter App consumer_secret | （必填） |
 | twitter_access_token_key | Twitter App access_token_key | （必填） |
 | twitter_access_token_secret | Twitter App access_token_secret | （必填） |
 | mode | 工作模式，0 为图文模式，1 为纯文本模式，2 为文本附图模式 | 0 |
+| resume_on_start | 是否在启动时继续退出时的进度（拉取本应用非活动时期错过的推文） | false |
 | work_interval | 对单个订阅两次拉取更新的最少间隔时间（秒） | 60 |
 | webshot_delay | 抓取网页截图时等待网页加载的延迟时长（毫秒） | 5000 |
 | lockfile | 本地保存订阅信息以便下次启动时恢复 | subscriber.lock |
@@ -40,5 +40,5 @@
 
 ## Todo
 
-- 重新实现基于 hash 的文件缓存，设定自动清理陈旧图片
+- 重新实现基于 hash 的文件缓存
 - 添加选项对时间线进行过滤

config.example.json

@@ -2,13 +2,13 @@
   "mirai_access_token": "",
   "mirai_http_host": "127.0.0.1",
   "mirai_http_port": 8080,
-  "mirai_http_base_dir": ".",
   "mirai_bot_qq": 10000,
   "twitter_consumer_key": "",
   "twitter_consumer_secret": "",
   "twitter_access_token_key": "",
   "twitter_access_token_secret": "",
   "mode": 0,
+  "resume_on_start": false,
   "work_interval": 60,
   "webshot_delay": 5000,
   "lockfile": "subscriber.lock",

dist/command.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsub = exports.list = exports.sub = void 0;
 const fs = require("fs");
 const path = require("path");
 const datetime_1 = require("./datetime");
@@ -61,7 +62,7 @@ https://twitter.com/rikakomoe/lists/lovelive`;
         lock.feed.push(link);
     if (!lock.threads[link]) {
         lock.threads[link] = {
-            offset: 0,
+            offset: '0',
             subscribers: [],
             updatedAt: '',
         };

dist/datetime.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.relativeDate = void 0;
 function relativeDate(dtstr) {
     if (!dtstr)
         return '暂无数据';

dist/helper.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function default_1(message) {
-    var _a, _b;
     message = message.trim();
     message = message.replace('\\\\', '\\0x5c');
     message = message.replace('\\\"', '\\0x22');
     message = message.replace('\\\'', '\\0x27');
     const strs = message.match(/'[\s\S]*?'|"[\s\S]*?"|\S*\[CQ:[\s\S]*?\]\S*|\S+/mg);
-    const cmd = ((_a = strs) === null || _a === void 0 ? void 0 : _a.length) ? strs[0].length ? strs[0].substring(0, 1) === '/' ? strs[0].substring(1) : '' : '' : '';
-    const args = (_b = strs) === null || _b === void 0 ? void 0 : _b.slice(1).map(arg => {
+    const cmd = (strs === null || strs === void 0 ? void 0 : strs.length) ? strs[0].length ? strs[0].substring(0, 1) === '/' ? strs[0].substring(1) : '' : '' : '';
+    const args = strs === null || strs === void 0 ? void 0 : strs.slice(1).map(arg => {
         arg = arg.replace(/^["']+|["']+$/g, '');
         arg = arg.replace('\\0x27', '\\\'');
         arg = arg.replace('\\0x22', '\\\"');

dist/loggers.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setLogLevels = exports.getLogger = void 0;
 const log4js_1 = require("log4js");
 const loggers = [];
 function getLogger(category) {
@@ -10,6 +11,6 @@ function getLogger(category) {
 }
 exports.getLogger = getLogger;
 function setLogLevels(level) {
-    loggers.forEach((l) => l.level = (level !== null && level !== void 0 ? level : 'info'));
+    loggers.forEach((l) => l.level = level !== null && level !== void 0 ? level : 'info');
 }
 exports.setLogLevels = setLogLevels;

dist/main.js

@@ -25,7 +25,7 @@ const sections = [
         header: 'Documentation',
         content: [
             'Project home: {underline https://github.com/CL-Jeremy/mirai-twitter-bot}',
-            'Example config: {underline https://github.com/CL-Jeremy/mirai-twitter-bot/blob/master/config.example.json}',
+            'Example config: {underline https://git.io/JJ0jN}',
         ],
     },
 ];
@@ -79,6 +79,9 @@ if (config.loglevel === undefined) {
 if (typeof config.mode !== 'number') {
     config.mode = 0;
 }
+if (typeof config.resume_on_start !== 'boolean') {
+    config.resume_on_start = false;
+}
 loggers_1.setLogLevels(config.loglevel);
 let lock;
 if (fs.existsSync(path.resolve(config.lockfile))) {
@@ -114,9 +117,11 @@ else {
         process.exit(1);
     }
 }
-Object.keys(lock.threads).forEach(key => {
-    lock.threads[key].offset = -1;
-});
+if (!config.resume_on_start) {
+    Object.keys(lock.threads).forEach(key => {
+        lock.threads[key].offset = '-1';
+    });
+}
 const qq = new mirai_1.default({
     access_token: config.mirai_access_token,
     host: config.mirai_http_host,
@@ -136,7 +141,6 @@ const worker = new twitter_1.default({
     workInterval: config.work_interval,
     bot: qq,
     webshotDelay: config.webshot_delay,
-    webshotOutDir: config.mirai_http_base_dir + '/images',
     mode: config.mode,
 });
 worker.launch();

dist/mirai.js

@@ -9,9 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Message = void 0;
 const axios_1 = require("axios");
 const mirai_ts_1 = require("mirai-ts");
 const message_1 = require("mirai-ts/dist/message");
+const temp = require("temp");
 const helper_1 = require("./helper");
 const loggers_1 = require("./loggers");
 const logger = loggers_1.getLogger('qqbot');
@@ -20,36 +22,73 @@ const ChatTypeMap = {
     FriendMessage: "private" /* Private */,
     TempMessage: "temp" /* Temp */,
 };
-exports.MiraiMessage = message_1.default;
+exports.Message = message_1.default;
 class default_1 {
     constructor(opt) {
-        this.sendTo = (subscriber, msg, timeout = -1) => (() => {
+        this.sendTo = (subscriber, msg) => (() => {
+            switch (subscriber.chatType) {
+                case 'group':
+                    return this.bot.api.sendGroupMessage(msg, subscriber.chatID);
+                case 'private':
+                    return this.bot.api.sendFriendMessage(msg, subscriber.chatID);
+            }
+        })()
+            .then(response => {
+            logger.info(`pushing data to ${subscriber.chatID} was successful, response:`);
+            logger.info(response);
+        })
+            .catch(reason => {
+            logger.error(`error pushing data to ${subscriber.chatID}, reason: ${reason}`);
+            throw Error(reason);
+        });
+        this.uploadPic = (img, timeout = -1) => {
             if (timeout)
                 timeout = Math.floor(timeout);
             if (timeout === 0 || timeout < -1) {
                 return Promise.reject('Error: timeout must be greater than 0ms');
             }
+            let imgFile;
+            if (img.imageId !== '')
+                return Promise.resolve();
+            if (img.url !== '') {
+                if (img.url.split(':')[0] !== 'data') {
+                    return Promise.reject('Error: URL must be of protocol "data"');
+                }
+                if (img.url.split(',')[0].split(';')[1] !== 'base64') {
+                    return Promise.reject('Error: data URL must be of encoding "base64"');
+                }
+                temp.track();
+                try {
+                    const tempFileStream = temp.createWriteStream();
+                    tempFileStream.write(img.url.split(',')[1], 'base64');
+                    tempFileStream.end();
+                    if (typeof (tempFileStream.path) === 'string')
+                        imgFile = tempFileStream.path;
+                }
+                catch (error) {
+                    logger.error(error);
+                }
+            }
             try {
                 this.bot.axios.defaults.timeout = timeout === -1 ? 0 : timeout;
-                switch (subscriber.chatType) {
-                    case 'group':
-                        return this.bot.api.sendGroupMessage(msg, subscriber.chatID);
-                    case 'private':
-                        return this.bot.api.sendFriendMessage(msg, subscriber.chatID);
-                }
+                logger.info(`uploading ${img.path}...`);
+                return this.bot.api.uploadImage('group', imgFile || img.path)
+                    .then(response => {
+                    logger.info(`uploading ${img.path} as group image was successful, response:`);
+                    logger.info(JSON.stringify(response));
+                    img.url = '';
+                    img.path = response.path.split(/[/\\]/).slice(-1)[0];
+                })
+                    .catch(reason => {
+                    logger.error(`error uploading ${img.path}, reason: ${reason}`);
+                    throw Error(reason);
+                });
             }
             finally {
+                temp.cleanup();
                 this.bot.axios.defaults.timeout = 0;
             }
-        })()
-            .then(response => {
-            logger.info(`pushing data to ${subscriber.chatID} was successful, response:`);
-            logger.info(response);
-        })
-            .catch(reason => {
-            logger.error(`error pushing data to ${subscriber.chatID}, reason: ${reason}`);
-            throw Error(reason);
-        });
+        };
         this.initBot = () => {
             this.bot = new mirai_ts_1.default({
                 authKey: this.botInfo.access_token,
@@ -93,7 +132,7 @@ class default_1 {
         // TODO doesn't work if connection is dropped after connection
         this.listen = (logMsg) => {
             if (logMsg !== '') {
-                logger.warn((logMsg !== null && logMsg !== void 0 ? logMsg : 'Listening...'));
+                logger.warn(logMsg !== null && logMsg !== void 0 ? logMsg : 'Listening...');
             }
             axios_1.default.get(`http://${this.botInfo.host}:${this.botInfo.port}/about`)
                 .then(() => __awaiter(this, void 0, void 0, function* () {
@@ -109,7 +148,7 @@ class default_1 {
             });
         };
         this.login = (logMsg) => __awaiter(this, void 0, void 0, function* () {
-            logger.warn((logMsg !== null && logMsg !== void 0 ? logMsg : 'Logging in...'));
+            logger.warn(logMsg !== null && logMsg !== void 0 ? logMsg : 'Logging in...');
             yield this.bot.login(this.botInfo.bot_id)
                 .then(() => logger.warn(`Logged in as ${this.botInfo.bot_id}`))
                 .catch(() => {

dist/twitter.js

@@ -4,13 +4,12 @@ const fs = require("fs");
 const path = require("path");
 const Twitter = require("twitter");
 const loggers_1 = require("./loggers");
-const mirai_1 = require("./mirai");
 const webshot_1 = require("./webshot");
 const logger = loggers_1.getLogger('twitter');
 class default_1 {
     constructor(opt) {
         this.launch = () => {
-            this.webshot = new webshot_1.default(this.webshotOutDir, this.mode, () => setTimeout(this.work, this.workInterval * 1000));
+            this.webshot = new webshot_1.default(this.mode, () => setTimeout(this.work, this.workInterval * 1000));
         };
         this.work = () => {
             const lock = this.lock;
@@ -34,9 +33,10 @@ class default_1 {
                 this.work();
                 return;
             }
-            logger.debug(`pulling feed ${lock.feed[lock.workon]}`);
+            const currentFeed = lock.feed[lock.workon];
+            logger.debug(`pulling feed ${currentFeed}`);
             const promise = new Promise(resolve => {
-                let match = lock.feed[lock.workon].match(/https:\/\/twitter.com\/([^\/]+)\/lists\/([^\/]+)/);
+                let match = currentFeed.match(/https:\/\/twitter.com\/([^\/]+)\/lists\/([^\/]+)/);
                 let config;
                 let endpoint;
                 if (match) {
@@ -48,7 +48,7 @@ class default_1 {
                     endpoint = 'lists/statuses';
                 }
                 else {
-                    match = lock.feed[lock.workon].match(/https:\/\/twitter.com\/([^\/]+)/);
+                    match = currentFeed.match(/https:\/\/twitter.com\/([^\/]+)/);
                     if (match) {
                         config = {
                             screen_name: match[1],
@@ -59,20 +59,20 @@ class default_1 {
                     }
                 }
                 if (endpoint) {
-                    const offset = lock.threads[lock.feed[lock.workon]].offset;
+                    const offset = lock.threads[currentFeed].offset;
                     if (offset > 0)
                         config.since_id = offset;
                     this.client.get(endpoint, config, (error, tweets, response) => {
                         if (error) {
                             if (error instanceof Array && error.length > 0 && error[0].code === 34) {
-                                logger.warn(`error on fetching tweets for ${lock.feed[lock.workon]}: ${JSON.stringify(error)}`);
-                                lock.threads[lock.feed[lock.workon]].subscribers.forEach(subscriber => {
-                                    logger.info(`sending notfound message of ${lock.feed[lock.workon]} to ${JSON.stringify(subscriber)}`);
-                                    this.bot.sendTo(subscriber, `链接 ${lock.feed[lock.workon]} 指向的用户或列表不存在，请退订。`).catch();
+                                logger.warn(`error on fetching tweets for ${currentFeed}: ${JSON.stringify(error)}`);
+                                lock.threads[currentFeed].subscribers.forEach(subscriber => {
+                                    logger.info(`sending notfound message of ${currentFeed} to ${JSON.stringify(subscriber)}`);
+                                    this.bot.sendTo(subscriber, `链接 ${currentFeed} 指向的用户或列表不存在，请退订。`).catch();
                                 });
                             }
                             else {
-                                logger.error(`unhandled error on fetching tweets for ${lock.feed[lock.workon]}: ${JSON.stringify(error)}`);
+                                logger.error(`unhandled error on fetching tweets for ${currentFeed}: ${JSON.stringify(error)}`);
                             }
                             resolve();
                         }
@@ -82,20 +82,24 @@ class default_1 {
                 }
             });
             promise.then((tweets) => {
-                logger.debug(`api returned ${JSON.stringify(tweets)} for feed ${lock.feed[lock.workon]}`);
+                logger.debug(`api returned ${JSON.stringify(tweets)} for feed ${currentFeed}`);
+                const currentThread = lock.threads[currentFeed];
+                const updateDate = () => currentThread.updatedAt = new Date().toString();
                 if (!tweets || tweets.length === 0) {
-                    lock.threads[lock.feed[lock.workon]].updatedAt = new Date().toString();
+                    updateDate();
                     return;
                 }
-                if (lock.threads[lock.feed[lock.workon]].offset === -1) {
-                    lock.threads[lock.feed[lock.workon]].offset = tweets[0].id_str;
+                const topOfFeed = tweets[0].id_str;
+                const updateOffset = () => currentThread.offset = topOfFeed;
+                if (currentThread.offset === '-1') {
+                    updateOffset();
                     return;
                 }
-                if (lock.threads[lock.feed[lock.workon]].offset === 0)
+                if (currentThread.offset === '0')
                     tweets.splice(1);
                 const maxCount = 3;
-                let sendTimeout = 10000;
-                const retryTimeout = 1500;
+                const uploadTimeout = 10000;
+                const retryInterval = 1500;
                 const ordinal = (n) => {
                     switch ((~~(n / 10) % 10 === 1) ? 0 : n % 10) {
                         case 1:
@@ -108,36 +112,47 @@ class default_1 {
                             return `${n}th`;
                     }
                 };
+                const retryOnError = (doWork, onRetry) => new Promise(resolve => {
+                    const retry = (reason, count) => {
+                        setTimeout(() => {
+                            let terminate = false;
+                            onRetry(reason, count, defaultValue => { terminate = true; resolve(defaultValue); });
+                            if (!terminate)
+                                doWork().then(resolve).catch(error => retry(error, count + 1));
+                        }, retryInterval);
+                    };
+                    doWork().then(resolve).catch(error => retry(error, 1));
+                });
+                const uploader = (message, lastResort) => {
+                    let timeout = uploadTimeout;
+                    return retryOnError(() => this.bot.uploadPic(message, timeout).then(() => message), (_, count, terminate) => {
+                        if (count <= maxCount) {
+                            timeout *= (count + 2) / (count + 1);
+                            logger.warn(`retry uploading for the ${ordinal(count)} time...`);
+                        }
+                        else {
+                            logger.warn(`${count - 1} consecutive failures while uploading, trying plain text instead...`);
+                            terminate(lastResort());
+                        }
+                    });
+                };
                 const sendTweets = (msg, text, author) => {
-                    lock.threads[lock.feed[lock.workon]].subscribers.forEach(subscriber => {
-                        logger.info(`pushing data of thread ${lock.feed[lock.workon]} to ${JSON.stringify(subscriber)}`);
-                        const retry = (reason, count) => {
-                            if (count <= maxCount)
-                                sendTimeout *= (count + 2) / (count + 1);
-                            setTimeout(() => {
-                                msg.forEach((message, pos) => {
-                                    if (count > maxCount && message.type === 'Image') {
-                                        if (pos === 0) {
-                                            logger.warn(`${count - 1} consecutive failures sending webshot, trying plain text instead...`);
-                                            msg[pos] = mirai_1.MiraiMessage.Plain(author + text);
-                                        }
-                                        else {
-                                            msg[pos] = mirai_1.MiraiMessage.Plain(`[失败的图片：${message.path}]`);
-                                        }
-                                    }
-                                });
+                    currentThread.subscribers.forEach(subscriber => {
+                        logger.info(`pushing data of thread ${currentFeed} to ${JSON.stringify(subscriber)}`);
+                        retryOnError(() => this.bot.sendTo(subscriber, msg), (_, count, terminate) => {
+                            if (count <= maxCount) {
                                 logger.warn(`retry sending to ${subscriber.chatID} for the ${ordinal(count)} time...`);
-                                this.bot.sendTo(subscriber, msg, sendTimeout).catch(error => retry(error, count + 1));
-                            }, retryTimeout);
-                        };
-                        this.bot.sendTo(subscriber, msg, sendTimeout).catch(error => retry(error, 1));
+                            }
+                            else {
+                                logger.warn(`${count - 1} consecutive failures while sending` +
+                                    'message chain, trying plain text instead...');
+                                terminate(this.bot.sendTo(subscriber, author + text));
+                            }
+                        });
                     });
                 };
-                return this.webshot(tweets, sendTweets, this.webshotDelay)
-                    .then(() => {
-                    lock.threads[lock.feed[lock.workon]].offset = tweets[0].id_str;
-                    lock.threads[lock.feed[lock.workon]].updatedAt = new Date().toString();
-                });
+                return this.webshot(tweets, uploader, sendTweets, this.webshotDelay)
+                    .then(updateDate).then(updateOffset);
             })
                 .then(() => {
                 lock.workon++;
@@ -161,7 +176,6 @@ class default_1 {
         this.workInterval = opt.workInterval;
         this.bot = opt.bot;
         this.webshotDelay = opt.webshotDelay;
-        this.webshotOutDir = opt.webshotOutDir;
         this.mode = opt.mode;
     }
 }

dist/webshot.js

@@ -2,16 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const CallableInstance = require("callable-instance");
-const fs_1 = require("fs");
 const html_entities_1 = require("html-entities");
 const pngjs_1 = require("pngjs");
 const puppeteer = require("puppeteer");
 const sharp = require("sharp");
 const loggers_1 = require("./loggers");
 const mirai_1 = require("./mirai");
-const writeOutTo = (path, data) => new Promise(resolve => {
-    data.pipe(fs_1.createWriteStream(path)).on('close', () => resolve(path));
-});
 const xmlEntities = new html_entities_1.XmlEntities();
 const typeInZH = {
     photo: '[图片]',
@@ -19,11 +15,8 @@ const typeInZH = {
     animated_gif: '[GIF]',
 };
 const logger = loggers_1.getLogger('webshot');
-const mkdirP = dir => { if (!fs_1.existsSync(dir))
-    fs_1.mkdirSync(dir, { recursive: true }); };
-const baseName = path => path.split(/[/\\]/).slice(-1)[0];
 class Webshot extends CallableInstance {
-    constructor(outDir, mode, onready) {
+    constructor(mode, onready) {
         super('webshot');
         // use local Chromium
         this.connect = (onready) => puppeteer.connect({ browserURL: 'http://127.0.0.1:9222' })
@@ -42,7 +35,9 @@ class Webshot extends CallableInstance {
         };
         this.renderWebshot = (url, height, webshotDelay) => {
             const jpeg = (data) => data.pipe(sharp()).jpeg({ quality: 90, trellisQuantisation: true });
-            const writeOutPic = (pic) => writeOutTo(`${this.outDir}/${url.replace(/[:\/]/g, '_')}.jpg`, pic);
+            const sharpToBase64 = (pic) => new Promise(resolve => {
+                pic.toBuffer().then(buffer => resolve(`data:image/jpg;base64,${buffer.toString('base64')}`));
+            });
             const promise = new Promise((resolve, reject) => {
                 const width = 720;
                 const zoomFactor = 2;
@@ -129,20 +124,20 @@ class Webshot extends CallableInstance {
                                     this.data = this.data.slice(0, idx(this.width, boundary));
                                     this.height = boundary;
                                 }
-                                writeOutPic(jpeg(this.pack())).then(path => {
+                                sharpToBase64(jpeg(this.pack())).then(base64 => {
                                     logger.info(`finished webshot for ${url}`);
-                                    resolve({ path, boundary });
+                                    resolve({ base64, boundary });
                                 });
                             }
                             else if (height >= 8 * 1920) {
                                 logger.warn('too large, consider as a bug, returning');
-                                writeOutPic(jpeg(this.pack())).then(path => {
-                                    resolve({ path, boundary: 0 });
+                                sharpToBase64(jpeg(this.pack())).then(base64 => {
+                                    resolve({ base64, boundary: 0 });
                                 });
                             }
                             else {
                                 logger.info('unable to find boundary, try shooting a larger image');
-                                resolve({ path: '', boundary });
+                                resolve({ base64: '', boundary });
                             }
                         }).parse(screenshot);
                     })
@@ -154,16 +149,16 @@ class Webshot extends CallableInstance {
                 if (data.boundary === null)
                     return this.renderWebshot(url, height + 1920, webshotDelay);
                 else
-                    return data.path;
+                    return data.base64;
             }).catch(error => new Promise(resolve => this.reconnect(error, resolve))
                 .then(() => this.renderWebshot(url, height, webshotDelay)));
         };
-        this.fetchImage = (url, tag) => new Promise(resolve => {
+        this.fetchImage = (url) => new Promise(resolve => {
             logger.info(`fetching ${url}`);
             axios_1.default({
                 method: 'get',
                 url,
-                responseType: 'stream',
+                responseType: 'arraybuffer',
             }).then(res => {
                 if (res.status === 200) {
                     logger.info(`successfully fetched ${url}`);
@@ -178,10 +173,18 @@ class Webshot extends CallableInstance {
                 resolve();
             });
         }).then(data => {
-            const imgName = `${tag}${baseName(url.replace(/(\.[a-z]+):(.*)/, '$1__$2$1'))}`;
-            return writeOutTo(`${this.outDir}/${imgName}`, data);
+            const mimetype = (ext => {
+                switch (ext) {
+                    case 'jpg':
+                        return 'image/jpeg';
+                    case 'png':
+                        return 'image/png';
+                    case 'gif':
+                        return 'image/gif';
+                }
+            })(url.match(/(\.[a-z]+):(.*)/)[1]);
+            return `data:${mimetype};base64,${Buffer.from(data).toString('base64')}`;
         });
-        mkdirP(this.outDir = outDir);
         // tslint:disable-next-line: no-conditional-assignment
         if (this.mode = mode) {
             onready();
@@ -190,7 +193,7 @@ class Webshot extends CallableInstance {
             this.connect(onready);
         }
     }
-    webshot(tweets, callback, webshotDelay) {
+    webshot(tweets, uploader, callback, webshotDelay) {
         let promise = new Promise(resolve => {
             resolve();
         });
@@ -217,24 +220,33 @@ class Webshot extends CallableInstance {
                     });
                 }
                 if (this.mode > 0)
-                    messageChain.push(mirai_1.MiraiMessage.Plain(author + xmlEntities.decode(text)));
+                    messageChain.push(mirai_1.Message.Plain(author + xmlEntities.decode(text)));
             });
             // invoke webshot
             if (this.mode === 0) {
                 const url = `https://mobile.twitter.com/${twi.user.screen_name}/status/${twi.id_str}`;
                 promise = promise.then(() => this.renderWebshot(url, 1920, webshotDelay))
-                    .then(webshotFilePath => {
-                    if (webshotFilePath)
-                        messageChain.push(mirai_1.MiraiMessage.Image('', '', baseName(webshotFilePath)));
+                    .then(base64url => {
+                    if (base64url) {
+                        return uploader(mirai_1.Message.Image('', base64url, url), () => mirai_1.Message.Plain(author + text));
+                    }
+                })
+                    .then(msg => {
+                    if (msg)
+                        messageChain.push(msg);
                 });
             }
             // fetch extra images
             if (1 - this.mode % 2) {
                 if (originTwi.extended_entities) {
-                    originTwi.extended_entities.media.forEach(media => promise = promise.then(() => this.fetchImage(media.media_url_https + ':orig', `${twi.user.screen_name}-${twi.id_str}--`)
-                        .then(path => {
-                        messageChain.push(mirai_1.MiraiMessage.Image('', '', baseName(path)));
-                    })));
+                    originTwi.extended_entities.media.forEach(media => {
+                        const url = media.media_url_https + ':orig';
+                        promise = promise.then(() => this.fetchImage(url))
+                            .then(base64url => uploader(mirai_1.Message.Image('', base64url, url), () => mirai_1.Message.Plain(`[失败的图片：${url}]`)))
+                            .then(msg => {
+                            messageChain.push(msg);
+                        });
+                    });
                 }
             }
             // append URLs, if any
@@ -245,14 +257,19 @@ class Webshot extends CallableInstance {
                             .filter(urlObj => urlObj.indices[0] < originTwi.display_text_range[1])
                             .map(urlObj => urlObj.expanded_url);
                         if (urls.length) {
-                            messageChain.push(mirai_1.MiraiMessage.Plain(urls.join('\n')));
+                            messageChain.push(mirai_1.Message.Plain(urls.join('\n')));
                         }
                     });
                 }
             }
             promise.then(() => {
                 logger.info(`done working on ${twi.user.screen_name}/${twi.id_str}, message chain:`);
-                logger.info(JSON.stringify(messageChain));
+                logger.info(JSON.stringify(messageChain.map(message => {
+                    if (message.type === 'Image' && message.url.startsWith('data:')) {
+                        return mirai_1.Message.Image(message.imageId, 'data:[...]', message.path);
+                    }
+                    return message;
+                })));
                 callback(messageChain, xmlEntities.decode(text), author);
             });
         });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirai-twitter-bot",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Mirai Twitter Bot",
   "main": "./dist/main.js",
   "bin": {
@@ -29,17 +29,17 @@
   "dependencies": {
     "callable-instance": "^2.0.0",
     "command-line-usage": "^5.0.5",
-    "cq-websocket": "1.2.6",
     "html-entities": "^1.3.1",
     "log4js": "^6.3.0",
-    "mirai-ts": "^0.3.1",
+    "mirai-ts": "^0.4.6",
     "pngjs": "^5.0.0",
     "puppeteer": "^2.1.0",
     "read-all-stream": "^3.1.0",
     "sha1": "^1.1.1",
     "sharp": "^0.25.4",
+    "temp": "^0.9.1",
     "twitter": "^1.7.1",
-    "typescript": "^2.9.2"
+    "typescript": "^3.9.7"
   },
   "devDependencies": {
     "@types/node": "^10.17.27",
@@ -47,7 +47,10 @@
     "@types/puppeteer": "^1.5.0",
     "@types/redis": "^2.8.6",
     "@types/sharp": "^0.25.0",
+    "@types/temp": "^0.8.34",
+    "@types/twitter": "^1.7.0",
     "tslint": "^5.10.0",
-    "tslint-config-prettier": "^1.13.0"
+    "tslint-config-prettier": "^1.13.0",
+    "twitter-d": "^0.4.0"
   }
 }

src/command.ts

@@ -61,7 +61,7 @@ https://twitter.com/rikakomoe/lists/lovelive`;
   if (!flag) lock.feed.push(link);
   if (!lock.threads[link]) {
     lock.threads[link] = {
-      offset: 0,
+      offset: '0',
       subscribers: [],
       updatedAt: '',
     };

src/main.ts

@@ -27,7 +27,7 @@ const sections = [
     header: 'Documentation',
     content: [
       'Project home: {underline https://github.com/CL-Jeremy/mirai-twitter-bot}',
-      'Example config: {underline https://github.com/CL-Jeremy/mirai-twitter-bot/blob/master/config.example.json}',
+      'Example config: {underline https://git.io/JJ0jN}',
     ],
   },
 ];
@@ -86,6 +86,9 @@ if (config.loglevel === undefined) {
 if (typeof config.mode !== 'number') {
   config.mode = 0;
 }
+if (typeof config.resume_on_start !== 'boolean') {
+  config.resume_on_start = false;
+}
 
 setLogLevels(config.loglevel);
 
@@ -121,9 +124,11 @@ if (fs.existsSync(path.resolve(config.lockfile))) {
   }
 }
 
-Object.keys(lock.threads).forEach(key => {
-  lock.threads[key].offset = -1;
-});
+if (!config.resume_on_start) {
+  Object.keys(lock.threads).forEach(key => {
+    lock.threads[key].offset = '-1';
+  });
+}
 
 const qq = new QQBot({
   access_token: config.mirai_access_token,
@@ -145,7 +150,6 @@ const worker = new Worker({
   workInterval: config.work_interval,
   bot: qq,
   webshotDelay: config.webshot_delay,
-  webshotOutDir: config.mirai_http_base_dir + '/images',
   mode: config.mode,
 });
 worker.launch();

src/mirai.ts

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import Mirai, { MessageType } from 'mirai-ts';
-import Message from 'mirai-ts/dist/message';
+import MiraiMessage from 'mirai-ts/dist/message';
+import * as temp from 'temp';
 
 import command from './helper';
 import { getLogger } from './loggers';
@@ -24,29 +25,20 @@ const ChatTypeMap: Record<MessageType.ChatMessageType, ChatType> = {
 };
 
 export type MessageChain = MessageType.MessageChain;
-export const MiraiMessage = Message;
+export const Message = MiraiMessage;
 
 export default class {
 
   private botInfo: IQQProps;
   public bot: Mirai;
 
-  public sendTo = (subscriber: IChat, msg: string | MessageChain, timeout = -1) =>
+  public sendTo = (subscriber: IChat, msg: string | MessageChain) =>
     (() => {
-      if (timeout) timeout = Math.floor(timeout);
-      if (timeout === 0 || timeout < -1) {
-        return Promise.reject('Error: timeout must be greater than 0ms');
-      }
-      try {
-        this.bot.axios.defaults.timeout = timeout === -1 ? 0 : timeout;
-        switch (subscriber.chatType) {
-          case 'group':
-            return this.bot.api.sendGroupMessage(msg, subscriber.chatID);
-          case 'private':
-            return this.bot.api.sendFriendMessage(msg, subscriber.chatID);
-        }
-      } finally {
-        this.bot.axios.defaults.timeout = 0;
+      switch (subscriber.chatType) {
+        case 'group':
+          return this.bot.api.sendGroupMessage(msg, subscriber.chatID);
+        case 'private':
+          return this.bot.api.sendFriendMessage(msg, subscriber.chatID);
       }
     })()
     .then(response => {
@@ -58,6 +50,50 @@ export default class {
       throw Error(reason);
     })
 
+  public uploadPic = (img: MessageType.Image, timeout = -1) => {
+    if (timeout) timeout = Math.floor(timeout);
+    if (timeout === 0 || timeout < -1) {
+      return Promise.reject('Error: timeout must be greater than 0ms');
+    }
+    let imgFile: string;
+    if (img.imageId !== '') return Promise.resolve();
+    if (img.url !== '') {
+      if (img.url.split(':')[0] !== 'data') {
+        return Promise.reject('Error: URL must be of protocol "data"');
+      }
+      if (img.url.split(',')[0].split(';')[1] !== 'base64') {
+        return Promise.reject('Error: data URL must be of encoding "base64"');
+      }
+      temp.track();
+      try {
+        const tempFileStream = temp.createWriteStream();
+        tempFileStream.write(img.url.split(',')[1], 'base64');
+        tempFileStream.end();
+        if (typeof(tempFileStream.path) === 'string') imgFile = tempFileStream.path;
+      } catch (error) {
+        logger.error(error);
+      }
+    }
+    try {
+      this.bot.axios.defaults.timeout = timeout === -1 ? 0 : timeout;
+      logger.info(`uploading ${img.path}...`);
+      return this.bot.api.uploadImage('group', imgFile || img.path)
+      .then(response => { // workaround for https://github.com/mamoe/mirai/issues/194
+        logger.info(`uploading ${img.path} as group image was successful, response:`);
+        logger.info(JSON.stringify(response));
+        img.url = '';
+        img.path = (response.path as string).split(/[/\\]/).slice(-1)[0];
+      })
+      .catch(reason => {
+        logger.error(`error uploading ${img.path}, reason: ${reason}`);
+        throw Error(reason);
+      });
+    } finally {
+      temp.cleanup();
+      this.bot.axios.defaults.timeout = 0;
+    }
+  }
+
   private initBot = () => {
     this.bot = new Mirai({
       authKey: this.botInfo.access_token,

src/model.d.ts

@@ -16,7 +16,7 @@ interface ILock {
   threads: {
     [key: string]:
       {
-        offset: number,
+        offset: string,
         updatedAt: string,
         subscribers: IChat[],
       }

src/twitter.ts

@@ -1,9 +1,10 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as Twitter from 'twitter';
+import TwitterTypes from 'twitter-d';
 
 import { getLogger } from './loggers';
-import QQBot, { MessageChain, MiraiMessage as Message } from './mirai';
+import QQBot, { Message, MessageChain } from './mirai';
 import Webshot from './webshot';
 
 interface IWorkerOption {
@@ -12,7 +13,6 @@ interface IWorkerOption {
   bot: QQBot;
   workInterval: number;
   webshotDelay: number;
-  webshotOutDir: string;
   consumer_key: string;
   consumer_secret: string;
   access_token_key: string;
@@ -22,15 +22,31 @@ interface IWorkerOption {
 
 const logger = getLogger('twitter');
 
+export type FullUser = TwitterTypes.FullUser;
+export type Entities = TwitterTypes.Entities;
+export type ExtendedEntities = TwitterTypes.ExtendedEntities;
+
+interface ITweet {
+  user: FullUser;
+  entities: Entities;
+  extended_entities: ExtendedEntities;
+  full_text: string;
+  display_text_range: [number, number];
+  id_str: string;
+  retweeted_status?: Tweet;
+}
+
+export type Tweet = ITweet;
+export type Tweets = ITweet[];
+
 export default class {
 
-  private client;
+  private client: Twitter;
   private lock: ILock;
   private lockfile: string;
   private workInterval: number;
   private bot: QQBot;
   private webshotDelay: number;
-  private webshotOutDir: string;
   private webshot: Webshot;
   private mode: number;
 
@@ -46,13 +62,11 @@ export default class {
     this.workInterval = opt.workInterval;
     this.bot = opt.bot;
     this.webshotDelay = opt.webshotDelay;
-    this.webshotOutDir = opt.webshotOutDir;
     this.mode = opt.mode;
   }
 
   public launch = () => {
     this.webshot = new Webshot(
-      this.webshotOutDir,
       this.mode,
       () => setTimeout(this.work, this.workInterval * 1000)
     );
@@ -79,10 +93,11 @@ export default class {
       return;
     }
 
-    logger.debug(`pulling feed ${lock.feed[lock.workon]}`);
+    const currentFeed = lock.feed[lock.workon];
+    logger.debug(`pulling feed ${currentFeed}`);
 
     const promise = new Promise(resolve => {
-      let match = lock.feed[lock.workon].match(/https:\/\/twitter.com\/([^\/]+)\/lists\/([^\/]+)/);
+      let match = currentFeed.match(/https:\/\/twitter.com\/([^\/]+)\/lists\/([^\/]+)/);
       let config: any;
       let endpoint: string;
       if (match) {
@@ -93,7 +108,7 @@ export default class {
         };
         endpoint = 'lists/statuses';
       } else {
-        match = lock.feed[lock.workon].match(/https:\/\/twitter.com\/([^\/]+)/);
+        match = currentFeed.match(/https:\/\/twitter.com\/([^\/]+)/);
         if (match) {
           config = {
             screen_name: match[1],
@@ -105,18 +120,18 @@ export default class {
       }
 
       if (endpoint) {
-        const offset = lock.threads[lock.feed[lock.workon]].offset;
+        const offset = lock.threads[currentFeed].offset as unknown as number;
         if (offset > 0) config.since_id = offset;
         this.client.get(endpoint, config, (error, tweets, response) => {
           if (error) {
             if (error instanceof Array && error.length > 0 && error[0].code === 34) {
-              logger.warn(`error on fetching tweets for ${lock.feed[lock.workon]}: ${JSON.stringify(error)}`);
-              lock.threads[lock.feed[lock.workon]].subscribers.forEach(subscriber => {
-                logger.info(`sending notfound message of ${lock.feed[lock.workon]} to ${JSON.stringify(subscriber)}`);
-                this.bot.sendTo(subscriber, `链接 ${lock.feed[lock.workon]} 指向的用户或列表不存在，请退订。`).catch();
+              logger.warn(`error on fetching tweets for ${currentFeed}: ${JSON.stringify(error)}`);
+              lock.threads[currentFeed].subscribers.forEach(subscriber => {
+                logger.info(`sending notfound message of ${currentFeed} to ${JSON.stringify(subscriber)}`);
+                this.bot.sendTo(subscriber, `链接 ${currentFeed} 指向的用户或列表不存在，请退订。`).catch();
               });
             } else {
-              logger.error(`unhandled error on fetching tweets for ${lock.feed[lock.workon]}: ${JSON.stringify(error)}`);
+              logger.error(`unhandled error on fetching tweets for ${currentFeed}: ${JSON.stringify(error)}`);
             }
             resolve();
           } else resolve(tweets);
@@ -124,21 +139,22 @@ export default class {
       }
     });
 
-    promise.then((tweets: any) => {
-      logger.debug(`api returned ${JSON.stringify(tweets)} for feed ${lock.feed[lock.workon]}`);
-      if (!tweets || tweets.length === 0) {
-        lock.threads[lock.feed[lock.workon]].updatedAt = new Date().toString();
-        return;
-      }
-      if (lock.threads[lock.feed[lock.workon]].offset === -1) {
-        lock.threads[lock.feed[lock.workon]].offset = tweets[0].id_str;
-        return;
-      }
-      if (lock.threads[lock.feed[lock.workon]].offset === 0) tweets.splice(1);
+    promise.then((tweets: Tweets) => {
+      logger.debug(`api returned ${JSON.stringify(tweets)} for feed ${currentFeed}`);
+      const currentThread = lock.threads[currentFeed];
+
+      const updateDate = () => currentThread.updatedAt = new Date().toString();
+      if (!tweets || tweets.length === 0) { updateDate(); return; }
+
+      const topOfFeed = tweets[0].id_str;
+      const updateOffset = () => currentThread.offset = topOfFeed;
+
+      if (currentThread.offset === '-1') { updateOffset(); return; }
+      if (currentThread.offset === '0') tweets.splice(1);
 
       const maxCount = 3;
-      let sendTimeout = 10000;
-      const retryTimeout = 1500;
+      const uploadTimeout = 10000;
+      const retryInterval = 1500;
       const ordinal = (n: number) => {
         switch ((~~(n / 10) % 10 === 1) ? 0 : n % 10) {
           case 1:
@@ -151,34 +167,57 @@ export default class {
             return `${n}th`;
         }
       };
+
+      const retryOnError = <T, U>(
+        doWork: () => Promise<T>,
+        onRetry: (error, count: number, terminate: (defaultValue: U) => void) => void
+      ) => new Promise<T | U>(resolve => {
+        const retry = (reason, count: number) => {
+          setTimeout(() => {
+            let terminate = false;
+            onRetry(reason, count, defaultValue => { terminate = true; resolve(defaultValue); });
+            if (!terminate) doWork().then(resolve).catch(error => retry(error, count + 1));
+          }, retryInterval);
+        };
+        doWork().then(resolve).catch(error => retry(error, 1));
+      });
+
+      const uploader = (
+        message: ReturnType<typeof Message.Image>,
+        lastResort: (...args) => ReturnType<typeof Message.Plain>
+      ) => {
+        let timeout = uploadTimeout;
+        return retryOnError(() =>
+          this.bot.uploadPic(message, timeout).then(() => message),
+        (_, count, terminate: (defaultValue: ReturnType<typeof Message.Plain>) => void) => {
+          if (count <= maxCount) {
+            timeout *= (count + 2) / (count + 1);
+            logger.warn(`retry uploading for the ${ordinal(count)} time...`);
+          } else {
+            logger.warn(`${count - 1} consecutive failures while uploading, trying plain text instead...`);
+            terminate(lastResort());
+          }
+        });
+      };
+
       const sendTweets = (msg: MessageChain, text: string, author: string) => {
-        lock.threads[lock.feed[lock.workon]].subscribers.forEach(subscriber => {
-          logger.info(`pushing data of thread ${lock.feed[lock.workon]} to ${JSON.stringify(subscriber)}`);
-          const retry = (reason, count: number) => { // workaround for https://github.com/mamoe/mirai/issues/194
-            if (count <= maxCount) sendTimeout *= (count + 2) / (count + 1);
-            setTimeout(() => {
-              (msg as MessageChain).forEach((message, pos) => {
-                if (count > maxCount && message.type === 'Image') {
-                  if (pos === 0) {
-                    logger.warn(`${count - 1} consecutive failures sending webshot, trying plain text instead...`);
-                    msg[pos] = Message.Plain(author + text);
-                  } else {
-                    msg[pos] = Message.Plain(`[失败的图片：${message.path}]`);
-                  }
-                }
-              });
+        currentThread.subscribers.forEach(subscriber => {
+          logger.info(`pushing data of thread ${currentFeed} to ${JSON.stringify(subscriber)}`);
+          retryOnError(
+            () => this.bot.sendTo(subscriber, msg),
+          (_, count, terminate: (doNothing: Promise<void>) => void) => {
+            if (count <= maxCount) {
               logger.warn(`retry sending to ${subscriber.chatID} for the ${ordinal(count)} time...`);
-              this.bot.sendTo(subscriber, msg, sendTimeout).catch(error => retry(error, count + 1));
-            }, retryTimeout);
-          };
-          this.bot.sendTo(subscriber, msg, sendTimeout).catch(error => retry(error, 1));
+            } else {
+              logger.warn(`${count - 1} consecutive failures while sending` +
+                'message chain, trying plain text instead...');
+              terminate(this.bot.sendTo(subscriber, author + text));
+            }
+          });
         });
       };
-      return (this.webshot as any)(tweets, sendTweets, this.webshotDelay)
-      .then(() => {
-        lock.threads[lock.feed[lock.workon]].offset = tweets[0].id_str;
-        lock.threads[lock.feed[lock.workon]].updatedAt = new Date().toString();
-      });
+      return this.webshot(tweets, uploader, sendTweets, this.webshotDelay)
+      .then(updateDate).then(updateOffset);
     })
       .then(() => {
         lock.workon++;
@@ -189,6 +228,5 @@ export default class {
           this.work();
         }, timeout);
       });
-
   }
 }

src/webshot.ts

@@ -1,20 +1,15 @@
 import axios from 'axios';
 import * as CallableInstance from 'callable-instance';
-import { createWriteStream, existsSync, mkdirSync } from 'fs';
 import { XmlEntities } from 'html-entities';
 import { PNG } from 'pngjs';
 import * as puppeteer from 'puppeteer';
 import { Browser } from 'puppeteer';
 import * as sharp from 'sharp';
-import { Stream } from 'stream';
+import { Readable } from 'stream';
 
 import { getLogger } from './loggers';
-import { MessageChain, MiraiMessage as Message } from './mirai';
-
-const writeOutTo = (path: string, data: Stream) =>
-  new Promise<string>(resolve => {
-    data.pipe(createWriteStream(path)).on('close', () => resolve(path));
-  });
+import { Message, MessageChain } from './mirai';
+import { Tweets } from './twitter';
 
 const xmlEntities = new XmlEntities();
 
@@ -26,18 +21,17 @@ const typeInZH = {
 
 const logger = getLogger('webshot');
 
-const mkdirP = dir => { if (!existsSync(dir)) mkdirSync(dir, {recursive: true}); };
-const baseName = path => path.split(/[/\\]/).slice(-1)[0];
-
-class Webshot extends CallableInstance<[number], Promise<void>> {
+class Webshot
+extends CallableInstance<
+  [Tweets, (...args) => Promise<any>, (...args) => void, number],
+  Promise<void>
+> {
 
   private browser: Browser;
-  private outDir: string;
   private mode: number;
 
-  constructor(outDir: string, mode: number, onready?: () => any) {
+  constructor(mode: number, onready?: () => any) {
     super('webshot');
-    mkdirP(this.outDir = outDir);
     // tslint:disable-next-line: no-conditional-assignment
     if (this.mode = mode) {
       onready();
@@ -63,9 +57,11 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
   }
 
   private renderWebshot = (url: string, height: number, webshotDelay: number): Promise<string> => {
-    const jpeg = (data: Stream) => data.pipe(sharp()).jpeg({quality: 90, trellisQuantisation: true});
-    const writeOutPic = (pic: Stream) => writeOutTo(`${this.outDir}/${url.replace(/[:\/]/g, '_')}.jpg`, pic);
-    const promise = new Promise<{ path: string, boundary: null | number }>((resolve, reject) => {
+    const jpeg = (data: Readable) => data.pipe(sharp()).jpeg({quality: 90, trellisQuantisation: true});
+    const sharpToBase64 = (pic: sharp.Sharp) => new Promise<string>(resolve => {
+      pic.toBuffer().then(buffer => resolve(`data:image/jpg;base64,${buffer.toString('base64')}`));
+    });
+    const promise = new Promise<{ base64: string, boundary: null | number }>((resolve, reject) => {
       const width = 720;
       const zoomFactor = 2;
       logger.info(`shooting ${width}*${height} webshot for ${url}`);
@@ -153,18 +149,18 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
                     this.height = boundary;
                   }
 
-                  writeOutPic(jpeg(this.pack())).then(path => {
+                  sharpToBase64(jpeg(this.pack())).then(base64 => {
                     logger.info(`finished webshot for ${url}`);
-                    resolve({path, boundary});
+                    resolve({base64, boundary});
                   });
                 } else if (height >= 8 * 1920) {
                   logger.warn('too large, consider as a bug, returning');
-                  writeOutPic(jpeg(this.pack())).then(path => {
-                    resolve({path, boundary: 0});
+                  sharpToBase64(jpeg(this.pack())).then(base64 => {
+                    resolve({base64, boundary: 0});
                   });
                 } else {
                   logger.info('unable to find boundary, try shooting a larger image');
-                  resolve({path: '', boundary});
+                  resolve({base64: '', boundary});
                 }
               }).parse(screenshot);
             })
@@ -174,20 +170,20 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
     });
     return promise.then(data => {
       if (data.boundary === null) return this.renderWebshot(url, height + 1920, webshotDelay);
-      else return data.path;
+      else return data.base64;
     }).catch(error =>
       new Promise(resolve => this.reconnect(error, resolve))
       .then(() => this.renderWebshot(url, height, webshotDelay))
     );
   }
 
-  private fetchImage = (url: string, tag: string): Promise<string> =>
-    new Promise<Stream>(resolve => {
+  private fetchImage = (url: string): Promise<string> =>
+    new Promise<ArrayBuffer>(resolve => {
       logger.info(`fetching ${url}`);
       axios({
         method: 'get',
         url,
-        responseType: 'stream',
+        responseType: 'arraybuffer',
       }).then(res => {
         if (res.status === 200) {
             logger.info(`successfully fetched ${url}`);
@@ -201,12 +197,25 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
         resolve();
       });
     }).then(data => {
-      const imgName = `${tag}${baseName(url.replace(/(\.[a-z]+):(.*)/, '$1__$2$1'))}`;
-      return writeOutTo(`${this.outDir}/${imgName}`, data);
+      const mimetype = (ext => {
+        switch (ext) {
+          case 'jpg':
+            return 'image/jpeg';
+          case 'png':
+            return 'image/png';
+          case 'gif':
+            return 'image/gif';
+        }
+      })(url.match(/(\.[a-z]+):(.*)/)[1]);
+      return `data:${mimetype};base64,${Buffer.from(data).toString('base64')}`;
     })
 
   public webshot(
-    tweets,
+    tweets: Tweets,
+    uploader: (
+      img: ReturnType<typeof Message.Image>,
+      lastResort: (...args) => ReturnType<typeof Message.Plain>)
+      => Promise<ReturnType<typeof Message.Image | typeof Message.Plain>>,
     callback: (msgs: MessageChain, text: string, author: string) => void,
     webshotDelay: number
   ): Promise<void> {
@@ -244,20 +253,28 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
       if (this.mode === 0) {
         const url = `https://mobile.twitter.com/${twi.user.screen_name}/status/${twi.id_str}`;
         promise = promise.then(() => this.renderWebshot(url, 1920, webshotDelay))
-          .then(webshotFilePath => {
-            if (webshotFilePath) messageChain.push(Message.Image('', '', baseName(webshotFilePath)));
+          .then(base64url => {
+            if (base64url) {
+              return uploader(Message.Image('', base64url, url), () => Message.Plain(author + text));
+            }
+          })
+          .then(msg => {
+            if (msg) messageChain.push(msg);
           });
       }
       // fetch extra images
       if (1 - this.mode % 2) {
         if (originTwi.extended_entities) {
-          originTwi.extended_entities.media.forEach(media =>
-            promise = promise.then(() =>
-              this.fetchImage(media.media_url_https + ':orig', `${twi.user.screen_name}-${twi.id_str}--`)
-              .then(path => {
-                messageChain.push(Message.Image('', '', baseName(path)));
-              })
-          ));
+          originTwi.extended_entities.media.forEach(media => {
+            const url = media.media_url_https + ':orig';
+            promise = promise.then(() => this.fetchImage(url))
+              .then(base64url =>
+                uploader(Message.Image('', base64url, url), () => Message.Plain(`[失败的图片：${url}]`))
+              )
+              .then(msg => {
+                messageChain.push(msg);
+              });
+          });
         }
       }
       // append URLs, if any
@@ -275,7 +292,12 @@ class Webshot extends CallableInstance<[number], Promise<void>> {
       }
       promise.then(() => {
         logger.info(`done working on ${twi.user.screen_name}/${twi.id_str}, message chain:`);
-        logger.info(JSON.stringify(messageChain));
+        logger.info(JSON.stringify(messageChain.map(message => {
+          if (message.type === 'Image' && message.url.startsWith('data:')) {
+            return Message.Image(message.imageId, 'data:[...]', message.path);
+          }
+          return message;
+        })));
         callback(messageChain, xmlEntities.decode(text), author);
       });
     });