Commit 30ee4734 authored by 神楽坂玲奈's avatar 神楽坂玲奈

clean

parent 9fd068f1
This diff is collapsed.
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rxjs": "^7.2.0", "rxjs": "^7.2.0",
"swagger-ui-express": "^4.1.6", "swagger-ui-express": "^4.1.6",
"tar": "^6.1.8",
"typeorm": "^0.2.37" "typeorm": "^0.2.37"
}, },
"optionalDependencies": { "optionalDependencies": {
...@@ -58,7 +57,6 @@ ...@@ -58,7 +57,6 @@
"@types/mustache": "^4.1.2", "@types/mustache": "^4.1.2",
"@types/node": "^16.0.0", "@types/node": "^16.0.0",
"@types/supertest": "^2.0.11", "@types/supertest": "^2.0.11",
"@types/tar": "^4.0.5",
"@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.2", "@typescript-eslint/parser": "^4.28.2",
"eslint": "^7.30.0", "eslint": "^7.30.0",
......
import { ConsoleLogger, Injectable } from '@nestjs/common';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import child_process from 'child_process'; import child_process from 'child_process';
import tar from 'tar';
import os from 'os'; import os from 'os';
import { S3Service } from '../s3/s3.service';
import { PutObjectCommand } from '@aws-sdk/client-s3';
import util from 'util'; import util from 'util';
import { v4 as uuidv4 } from 'uuid';
import readdirp from 'readdirp';
import _ from 'lodash'; import _ from 'lodash';
import readdirp from 'readdirp';
import { v4 as uuidv4 } from 'uuid';
import { ConsoleLogger, Injectable } from '@nestjs/common';
import { PutObjectCommand } from '@aws-sdk/client-s3';
import { S3Service } from '../s3/s3.service';
@Injectable() @Injectable()
export class PackagerService extends ConsoleLogger { export class PackagerService extends ConsoleLogger {
...@@ -29,9 +31,7 @@ export class PackagerService extends ConsoleLogger { ...@@ -29,9 +31,7 @@ export class PackagerService extends ConsoleLogger {
const root = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'mycard-console-')); const root = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'mycard-console-'));
await this.spawnAsync('tar', ['-zxvf', '-'], { cwd: root, stdio: [stream, 'inherit', 'inherit'] }); await this.spawnAsync('tar', ['-zxvf', '-'], { cwd: root, stdio: [stream, 'inherit', 'inherit'] });
const buckets: Record<string, [string[], number]> = {};
const packages: Record<string, string[]> = {}; const packages: Record<string, string[]> = {};
const entries = await readdirp.promise(root, { alwaysStat: true, type: 'files_directories' }); const entries = await readdirp.promise(root, { alwaysStat: true, type: 'files_directories' });
const [directories, files] = _.partition(entries, (item) => item.stats.isDirectory()); const [directories, files] = _.partition(entries, (item) => item.stats.isDirectory());
...@@ -49,6 +49,7 @@ export class PackagerService extends ConsoleLogger { ...@@ -49,6 +49,7 @@ export class PackagerService extends ConsoleLogger {
promises.push(this.archive(archive, root, await fs.promises.readdir(root))); promises.push(this.archive(archive, root, await fs.promises.readdir(root)));
// 散包 // 散包
const buckets: Record<string, [string[], number]> = {};
for (const file of files) { for (const file of files) {
if (file.stats.size < bucket_enter) { if (file.stats.size < bucket_enter) {
const extname = path.extname(file.basename); const extname = path.extname(file.basename);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment