update deps
This commit is contained in:
		
							parent
							
								
									f69867fcff
								
							
						
					
					
						commit
						8c9a13b2b7
					
				
					 9 changed files with 398 additions and 310 deletions
				
			
		|  | @ -19,12 +19,12 @@ | |||
| 		"@koa/cors": "3.1.0", | ||||
| 		"@koa/multer": "3.0.0", | ||||
| 		"@koa/router": "9.0.1", | ||||
| 		"@sinonjs/fake-timers": "7.1.2", | ||||
| 		"@sinonjs/fake-timers": "9.1.0", | ||||
| 		"@syuilo/aiscript": "0.11.1", | ||||
| 		"@types/bcryptjs": "2.4.2", | ||||
| 		"@types/bull": "3.15.7", | ||||
| 		"@types/cbor": "6.0.0", | ||||
| 		"@types/dateformat": "3.0.1", | ||||
| 		"@types/dateformat": "5.0.0", | ||||
| 		"@types/escape-regexp": "0.0.1", | ||||
| 		"@types/glob": "7.2.0", | ||||
| 		"@types/is-url": "1.2.30", | ||||
|  | @ -43,7 +43,7 @@ | |||
| 		"@types/koa__multer": "2.0.4", | ||||
| 		"@types/koa__router": "8.0.11", | ||||
| 		"@types/mocha": "8.2.3", | ||||
| 		"@types/node": "17.0.10", | ||||
| 		"@types/node": "17.0.14", | ||||
| 		"@types/node-fetch": "3.0.3", | ||||
| 		"@types/nodemailer": "6.4.4", | ||||
| 		"@types/oauth": "0.9.1", | ||||
|  | @ -58,52 +58,52 @@ | |||
| 		"@types/rename": "1.0.4", | ||||
| 		"@types/request-stats": "3.0.0", | ||||
| 		"@types/sanitize-html": "2.6.2", | ||||
| 		"@types/seedrandom": "2.4.28", | ||||
| 		"@types/seedrandom": "3.0.1", | ||||
| 		"@types/sharp": "0.29.5", | ||||
| 		"@types/sinonjs__fake-timers": "6.0.4", | ||||
| 		"@types/sinonjs__fake-timers": "8.1.1", | ||||
| 		"@types/speakeasy": "2.0.7", | ||||
| 		"@types/throttle-debounce": "2.1.0", | ||||
| 		"@types/tinycolor2": "1.4.3", | ||||
| 		"@types/tmp": "0.2.3", | ||||
| 		"@types/uuid": "8.3.4", | ||||
| 		"@types/web-push": "3.3.2", | ||||
| 		"@types/websocket": "1.0.4", | ||||
| 		"@types/websocket": "1.0.5", | ||||
| 		"@types/ws": "8.2.2", | ||||
| 		"@typescript-eslint/eslint-plugin": "5.10.0", | ||||
| 		"@typescript-eslint/parser": "5.10.0", | ||||
| 		"@typescript-eslint/eslint-plugin": "5.10.2", | ||||
| 		"@typescript-eslint/parser": "5.10.2", | ||||
| 		"abort-controller": "3.0.0", | ||||
| 		"archiver": "5.3.0", | ||||
| 		"autobind-decorator": "2.4.0", | ||||
| 		"autwh": "0.1.0", | ||||
| 		"aws-sdk": "2.1061.0", | ||||
| 		"aws-sdk": "2.1067.0", | ||||
| 		"bcryptjs": "2.4.3", | ||||
| 		"blurhash": "1.1.4", | ||||
| 		"broadcast-channel": "4.9.0", | ||||
| 		"bull": "4.2.1", | ||||
| 		"bull": "4.5.0", | ||||
| 		"cacheable-lookup": "6.0.4", | ||||
| 		"cafy": "15.2.1", | ||||
| 		"cbor": "8.1.0", | ||||
| 		"chalk": "4.1.2", | ||||
| 		"cli-highlight": "2.1.11", | ||||
| 		"content-disposition": "0.5.4", | ||||
| 		"crc-32": "1.2.0", | ||||
| 		"dateformat": "4.5.1", | ||||
| 		"crc-32": "1.2.1", | ||||
| 		"dateformat": "5.0.2", | ||||
| 		"deep-email-validator": "0.1.21", | ||||
| 		"escape-regexp": "0.0.1", | ||||
| 		"eslint": "8.7.0", | ||||
| 		"eslint": "8.8.0", | ||||
| 		"eslint-plugin-import": "2.25.4", | ||||
| 		"eventemitter3": "4.0.7", | ||||
| 		"feed": "4.2.2", | ||||
| 		"file-type": "16.5.3", | ||||
| 		"fluent-ffmpeg": "2.1.2", | ||||
| 		"glob": "7.2.0", | ||||
| 		"got": "11.8.2", | ||||
| 		"got": "12.0.1", | ||||
| 		"hpagent": "0.1.2", | ||||
| 		"http-signature": "1.3.6", | ||||
| 		"ip-cidr": "3.0.4", | ||||
| 		"is-svg": "4.3.2", | ||||
| 		"js-yaml": "4.1.0", | ||||
| 		"jsdom": "16.7.0", | ||||
| 		"jsdom": "19.0.0", | ||||
| 		"json5": "2.2.0", | ||||
| 		"json5-loader": "4.0.1", | ||||
| 		"jsonld": "5.2.0", | ||||
|  | @ -132,7 +132,7 @@ | |||
| 		"pg": "8.7.1", | ||||
| 		"portscanner": "2.2.0", | ||||
| 		"private-ip": "2.3.3", | ||||
| 		"probe-image-size": "7.2.2", | ||||
| 		"probe-image-size": "7.2.3", | ||||
| 		"promise-limit": "2.7.0", | ||||
| 		"pug": "3.0.2", | ||||
| 		"punycode": "2.1.1", | ||||
|  | @ -151,14 +151,14 @@ | |||
| 		"s-age": "1.1.2", | ||||
| 		"sanitize-html": "2.6.1", | ||||
| 		"seedrandom": "3.0.5", | ||||
| 		"sharp": "0.29.3", | ||||
| 		"sharp": "0.30.0", | ||||
| 		"speakeasy": "2.0.0", | ||||
| 		"strict-event-emitter-types": "2.0.0", | ||||
| 		"stringz": "2.1.0", | ||||
| 		"style-loader": "3.3.1", | ||||
| 		"summaly": "2.5.0", | ||||
| 		"syslog-pro": "1.0.0", | ||||
| 		"systeminformation": "5.9.9", | ||||
| 		"systeminformation": "5.11.0", | ||||
| 		"throttle-debounce": "3.0.1", | ||||
| 		"tinycolor2": "1.4.2", | ||||
| 		"tmp": "0.2.1", | ||||
|  |  | |||
|  | @ -38,7 +38,9 @@ export async function downloadUrl(url: string, path: string): Promise<void> { | |||
| 			https: httpsAgent, | ||||
| 		}, | ||||
| 		http2: false,	// default
 | ||||
| 		retry: 0, | ||||
| 		retry: { | ||||
| 			limit: 0, | ||||
| 		}, | ||||
| 	}).on('response', (res: Got.Response) => { | ||||
| 		if ((process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') && !config.proxy && res.ip) { | ||||
| 			if (isPrivateIp(res.ip)) { | ||||
|  | @ -75,7 +77,7 @@ export async function downloadUrl(url: string, path: string): Promise<void> { | |||
| 	logger.succ(`Download finished: ${chalk.cyan(url)}`); | ||||
| } | ||||
| 
 | ||||
| function isPrivateIp(ip: string) { | ||||
| function isPrivateIp(ip: string): boolean { | ||||
| 	for (const net of config.allowedPrivateNetworks || []) { | ||||
| 		const cidr = new IPCIDR(net); | ||||
| 		if (cidr.contains(ip)) { | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import * as fs from 'fs'; | |||
| 
 | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { getFullApAccount } from '@/misc/convert-host'; | ||||
| import { Users, Blockings } from '@/models/index'; | ||||
| import { MoreThan } from 'typeorm'; | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ const mime = require('mime-types'); | |||
| const archiver = require('archiver'); | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { Users, Emojis } from '@/models/index'; | ||||
| import {  } from '@/queue/types'; | ||||
| import { downloadUrl } from '@/misc/download-url'; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import * as fs from 'fs'; | |||
| 
 | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { getFullApAccount } from '@/misc/convert-host'; | ||||
| import { Users, Followings, Mutings } from '@/models/index'; | ||||
| import { In, MoreThan, Not } from 'typeorm'; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import * as fs from 'fs'; | |||
| 
 | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { getFullApAccount } from '@/misc/convert-host'; | ||||
| import { Users, Mutings } from '@/models/index'; | ||||
| import { MoreThan } from 'typeorm'; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import * as fs from 'fs'; | |||
| 
 | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { Users, Notes, Polls } from '@/models/index'; | ||||
| import { MoreThan } from 'typeorm'; | ||||
| import { Note } from '@/models/entities/note'; | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ import * as fs from 'fs'; | |||
| 
 | ||||
| import { queueLogger } from '../../logger'; | ||||
| import { addFile } from '@/services/drive/add-file'; | ||||
| import * as dateFormat from 'dateformat'; | ||||
| import dateFormat from 'dateformat'; | ||||
| import { getFullApAccount } from '@/misc/convert-host'; | ||||
| import { Users, UserLists, UserListJoinings } from '@/models/index'; | ||||
| import { In } from 'typeorm'; | ||||
|  |  | |||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue