@things-factory/attachment-base 5.0.0-alpha.7 → 5.0.0-y.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/service/attachment/attachment-query.js +5 -6
- package/dist-server/service/attachment/attachment-query.js.map +1 -1
- package/dist-server/storage-file.js +3 -6
- package/dist-server/storage-file.js.map +1 -1
- package/dist-server/storage-s3.js +3 -6
- package/dist-server/storage-s3.js.map +1 -1
- package/package.json +5 -4
- package/server/service/attachment/attachment-query.ts +6 -9
- package/server/storage-file.ts +3 -3
- package/server/storage-s3.ts +5 -10
|
@@ -20,8 +20,9 @@ const shell_1 = require("@things-factory/shell");
|
|
|
20
20
|
const __1 = require("../");
|
|
21
21
|
const attachment_1 = require("./attachment");
|
|
22
22
|
let AttachmentQuery = class AttachmentQuery {
|
|
23
|
-
async attachments(context,
|
|
24
|
-
const
|
|
23
|
+
async attachments(context, params) {
|
|
24
|
+
const { domain } = context.state;
|
|
25
|
+
const convertedParams = (0, shell_1.convertListParams)(params, { domain, searchables: ['name', 'description'] });
|
|
25
26
|
const [items, total] = await (0, typeorm_1.getRepository)(attachment_1.Attachment).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'creator', 'updater'] }));
|
|
26
27
|
return { items, total };
|
|
27
28
|
}
|
|
@@ -35,11 +36,9 @@ let AttachmentQuery = class AttachmentQuery {
|
|
|
35
36
|
__decorate([
|
|
36
37
|
(0, type_graphql_1.Query)(returns => __1.AttachmentList),
|
|
37
38
|
__param(0, (0, type_graphql_1.Ctx)()),
|
|
38
|
-
__param(1, (0, type_graphql_1.
|
|
39
|
-
__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
|
|
40
|
-
__param(3, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
|
|
39
|
+
__param(1, (0, type_graphql_1.Args)()),
|
|
41
40
|
__metadata("design:type", Function),
|
|
42
|
-
__metadata("design:paramtypes", [Object,
|
|
41
|
+
__metadata("design:paramtypes", [Object, typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object]),
|
|
43
42
|
__metadata("design:returntype", Promise)
|
|
44
43
|
], AttachmentQuery.prototype, "attachments", null);
|
|
45
44
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment-query.js","sourceRoot":"","sources":["../../../server/service/attachment/attachment-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"attachment-query.js","sourceRoot":"","sources":["../../../server/service/attachment/attachment-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8D;AAC9D,qCAAuC;AAEvC,iDAAoE;AAEpE,2BAAoC;AACpC,6CAAyC;AAGzC,IAAa,eAAe,GAA5B,MAAa,eAAe;IAE1B,KAAK,CAAC,WAAW,CAAQ,OAAY,EAAU,MAAiB;QAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAA;QACnG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAU,CAAC,CAAC,YAAY,iCAC9D,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,IAC3C,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGD,KAAK,CAAC,UAAU,CAAY,EAAU,EAAS,OAAY;QACzD,OAAO,MAAM,IAAA,uBAAa,EAAC,uBAAU,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE;YAC3C,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5C,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAnBC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,kBAAc,CAAC;IACd,WAAA,IAAA,kBAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,mBAAI,GAAE,CAAA;;iEAAS,iBAAS,oBAAT,iBAAS;;kDAU/D;AAGD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,uBAAU,CAAC;IACX,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;iDAK7C;AApBU,eAAe;IAD3B,IAAA,uBAAQ,EAAC,uBAAU,CAAC;GACR,eAAe,CAqB3B;AArBY,0CAAe"}
|
|
@@ -22,22 +22,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
26
|
const fs = __importStar(require("fs"));
|
|
30
27
|
const mkdirp = __importStar(require("mkdirp"));
|
|
31
28
|
const path_1 = require("path");
|
|
32
|
-
const v4_1 = __importDefault(require("uuid/v4"));
|
|
33
29
|
const env_1 = require("@things-factory/env");
|
|
34
30
|
const attachment_const_1 = require("./attachment-const");
|
|
31
|
+
const crypto = require('crypto');
|
|
35
32
|
const send = require('koa-send');
|
|
36
33
|
if (attachment_const_1.STORAGE && attachment_const_1.STORAGE.type == 'file') {
|
|
37
34
|
const uploadDir = env_1.config.getPath(null, attachment_const_1.STORAGE.base || 'attachments');
|
|
38
35
|
attachment_const_1.STORAGE.uploadFile = ({ stream, filename }) => {
|
|
39
36
|
mkdirp.sync(uploadDir);
|
|
40
|
-
const id =
|
|
37
|
+
const id = crypto.randomUUID();
|
|
41
38
|
const ext = filename.split('.').pop();
|
|
42
39
|
const path = ext ? (0, path_1.resolve)(uploadDir, `${id}.${ext}`) : (0, path_1.resolve)(uploadDir, id);
|
|
43
40
|
const relativePath = path.split('\\').pop().split('/').pop();
|
|
@@ -66,7 +63,7 @@ if (attachment_const_1.STORAGE && attachment_const_1.STORAGE.type == 'file') {
|
|
|
66
63
|
return fs.readFileSync(fullpath, encoding);
|
|
67
64
|
};
|
|
68
65
|
attachment_const_1.STORAGE.generateUploadURL = async (type) => {
|
|
69
|
-
const id =
|
|
66
|
+
const id = crypto.randomUUID();
|
|
70
67
|
return await {
|
|
71
68
|
url: `/${attachment_const_1.ATTACHMENT_PATH}`,
|
|
72
69
|
fields: {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-file.js","sourceRoot":"","sources":["../server/storage-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage-file.js","sourceRoot":"","sources":["../server/storage-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const v4_1 = __importDefault(require("uuid/v4"));
|
|
7
3
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
8
4
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
9
5
|
const s3_presigned_post_1 = require("@aws-sdk/s3-presigned-post");
|
|
10
6
|
const env_1 = require("@things-factory/env");
|
|
11
7
|
const attachment_const_1 = require("./attachment-const");
|
|
8
|
+
const crypto = require('crypto');
|
|
12
9
|
const mime = require('mime');
|
|
13
10
|
const { fs } = require('memfs');
|
|
14
11
|
if (attachment_const_1.STORAGE && attachment_const_1.STORAGE.type == 's3') {
|
|
@@ -27,7 +24,7 @@ if (attachment_const_1.STORAGE && attachment_const_1.STORAGE.type == 's3') {
|
|
|
27
24
|
});
|
|
28
25
|
/* upload file */
|
|
29
26
|
attachment_const_1.STORAGE.uploadFile = async ({ stream, filename }) => {
|
|
30
|
-
const id =
|
|
27
|
+
const id = crypto.randomUUID();
|
|
31
28
|
const ext = filename.split('.').pop();
|
|
32
29
|
const key = ext ? `${id}.${ext}` : id;
|
|
33
30
|
var size = 0;
|
|
@@ -89,7 +86,7 @@ if (attachment_const_1.STORAGE && attachment_const_1.STORAGE.type == 's3') {
|
|
|
89
86
|
};
|
|
90
87
|
attachment_const_1.STORAGE.generateUploadURL = async (type) => {
|
|
91
88
|
const expiresInMinutes = 1;
|
|
92
|
-
const id =
|
|
89
|
+
const id = crypto.randomUUID();
|
|
93
90
|
return await (0, s3_presigned_post_1.createPresignedPost)(client, {
|
|
94
91
|
Bucket: attachment_const_1.STORAGE.bucketName,
|
|
95
92
|
Key: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-s3.js","sourceRoot":"","sources":["../server/storage-s3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage-s3.js","sourceRoot":"","sources":["../server/storage-s3.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/attachment-base",
|
|
3
|
-
"version": "5.0.0-
|
|
3
|
+
"version": "5.0.0-y.0",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,11 +28,12 @@
|
|
|
28
28
|
"@aws-sdk/lib-storage": "^3.46.0",
|
|
29
29
|
"@aws-sdk/s3-presigned-post": "^3.46.0",
|
|
30
30
|
"@koa/multer": "^3.0.0",
|
|
31
|
-
"@things-factory/auth-base": "^5.0.0-
|
|
32
|
-
"@things-factory/env": "^5.0.0-
|
|
31
|
+
"@things-factory/auth-base": "^5.0.0-y.0",
|
|
32
|
+
"@things-factory/env": "^5.0.0-y.0",
|
|
33
|
+
"@things-factory/shell": "^5.0.0-y.0",
|
|
33
34
|
"memfs": "^3.0.1",
|
|
34
35
|
"mime": "^2.4.4",
|
|
35
36
|
"multer": "^1.3.0"
|
|
36
37
|
},
|
|
37
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "2fb8066dae72d864b0fc3a5b439a18579fa39ee6"
|
|
38
39
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Arg, Ctx, Query, Resolver } from 'type-graphql'
|
|
1
|
+
import { Arg, Args, Ctx, Query, Resolver } from 'type-graphql'
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
|
-
import { convertListParams,
|
|
4
|
+
import { convertListParams, ListParam } from '@things-factory/shell'
|
|
5
5
|
|
|
6
6
|
import { AttachmentList } from '../'
|
|
7
7
|
import { Attachment } from './attachment'
|
|
@@ -9,13 +9,10 @@ import { Attachment } from './attachment'
|
|
|
9
9
|
@Resolver(Attachment)
|
|
10
10
|
export class AttachmentQuery {
|
|
11
11
|
@Query(returns => AttachmentList)
|
|
12
|
-
async attachments(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
@Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
|
|
17
|
-
): Promise<AttachmentList> {
|
|
18
|
-
const convertedParams = convertListParams({ filters, pagination, sortings }, context.state.domain.id)
|
|
12
|
+
async attachments(@Ctx() context: any, @Args() params: ListParam): Promise<AttachmentList> {
|
|
13
|
+
const { domain } = context.state
|
|
14
|
+
|
|
15
|
+
const convertedParams = convertListParams(params, { domain, searchables: ['name', 'description'] })
|
|
19
16
|
const [items, total] = await getRepository(Attachment).findAndCount({
|
|
20
17
|
...convertedParams,
|
|
21
18
|
relations: ['domain', 'creator', 'updater']
|
package/server/storage-file.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as fs from 'fs'
|
|
2
2
|
import * as mkdirp from 'mkdirp'
|
|
3
3
|
import { resolve } from 'path'
|
|
4
|
-
import uuid from 'uuid/v4'
|
|
5
4
|
|
|
6
5
|
import { config, logger } from '@things-factory/env'
|
|
7
6
|
|
|
8
7
|
import { ATTACHMENT_PATH, STORAGE } from './attachment-const'
|
|
9
8
|
|
|
9
|
+
const crypto = require('crypto')
|
|
10
10
|
const send = require('koa-send')
|
|
11
11
|
|
|
12
12
|
if (STORAGE && STORAGE.type == 'file') {
|
|
@@ -15,7 +15,7 @@ if (STORAGE && STORAGE.type == 'file') {
|
|
|
15
15
|
STORAGE.uploadFile = ({ stream, filename }) => {
|
|
16
16
|
mkdirp.sync(uploadDir)
|
|
17
17
|
|
|
18
|
-
const id =
|
|
18
|
+
const id = crypto.randomUUID()
|
|
19
19
|
const ext = filename.split('.').pop()
|
|
20
20
|
const path = ext ? resolve(uploadDir, `${id}.${ext}`) : resolve(uploadDir, id)
|
|
21
21
|
const relativePath = path.split('\\').pop().split('/').pop()
|
|
@@ -53,7 +53,7 @@ if (STORAGE && STORAGE.type == 'file') {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
STORAGE.generateUploadURL = async (type: string): Promise<{ url: string; fields: { [key: string]: string } }> => {
|
|
56
|
-
const id =
|
|
56
|
+
const id = crypto.randomUUID()
|
|
57
57
|
|
|
58
58
|
return await {
|
|
59
59
|
url: `/${ATTACHMENT_PATH}`,
|
package/server/storage-s3.ts
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
import type { Readable } from 'stream'
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
import {
|
|
5
|
-
DeleteObjectCommand,
|
|
6
|
-
GetObjectCommand,
|
|
7
|
-
GetObjectCommandInput,
|
|
8
|
-
S3Client
|
|
9
|
-
} from '@aws-sdk/client-s3'
|
|
2
|
+
|
|
3
|
+
import { DeleteObjectCommand, GetObjectCommand, GetObjectCommandInput, S3Client } from '@aws-sdk/client-s3'
|
|
10
4
|
import { Upload } from '@aws-sdk/lib-storage'
|
|
11
5
|
import { createPresignedPost } from '@aws-sdk/s3-presigned-post'
|
|
12
6
|
import { logger } from '@things-factory/env'
|
|
13
7
|
|
|
14
8
|
import { STORAGE } from './attachment-const'
|
|
15
9
|
|
|
10
|
+
const crypto = require('crypto')
|
|
16
11
|
const mime = require('mime')
|
|
17
12
|
const { fs } = require('memfs')
|
|
18
13
|
|
|
@@ -35,7 +30,7 @@ if (STORAGE && STORAGE.type == 's3') {
|
|
|
35
30
|
|
|
36
31
|
/* upload file */
|
|
37
32
|
STORAGE.uploadFile = async ({ stream, filename }) => {
|
|
38
|
-
const id =
|
|
33
|
+
const id = crypto.randomUUID()
|
|
39
34
|
const ext = filename.split('.').pop()
|
|
40
35
|
const key = ext ? `${id}.${ext}` : id
|
|
41
36
|
var size: number = 0
|
|
@@ -112,7 +107,7 @@ if (STORAGE && STORAGE.type == 's3') {
|
|
|
112
107
|
|
|
113
108
|
STORAGE.generateUploadURL = async (type: string): Promise<{ url: string; fields: { [key: string]: string } }> => {
|
|
114
109
|
const expiresInMinutes = 1
|
|
115
|
-
const id =
|
|
110
|
+
const id = crypto.randomUUID()
|
|
116
111
|
|
|
117
112
|
return await createPresignedPost(client, {
|
|
118
113
|
Bucket: STORAGE.bucketName,
|