@zlooks.cn/images-server 1.0.2 → 1.0.4
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/assets/read-image-asset.d.ts.map +1 -1
- package/dist/assets/read-image-asset.js +7 -2
- package/dist/assets/read-image-asset.js.map +1 -1
- package/dist/assets/response-policy.d.ts.map +1 -1
- package/dist/assets/response-policy.js +10 -4
- package/dist/assets/response-policy.js.map +1 -1
- package/dist/domain/image-error.d.ts +5 -2
- package/dist/domain/image-error.d.ts.map +1 -1
- package/dist/domain/image-error.js.map +1 -1
- package/dist/domain/output-schema.d.ts +1 -62
- package/dist/domain/output-schema.d.ts.map +1 -1
- package/dist/domain/output-schema.js +1 -24
- package/dist/domain/output-schema.js.map +1 -1
- package/dist/domain/schema.d.ts +1 -68
- package/dist/domain/schema.d.ts.map +1 -1
- package/dist/domain/schema.js +1 -43
- package/dist/domain/schema.js.map +1 -1
- package/dist/identity.d.ts +1 -1
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +1 -1
- package/dist/identity.js.map +1 -1
- package/dist/mcp/provider.d.ts +2 -1
- package/dist/mcp/provider.d.ts.map +1 -1
- package/dist/mcp/provider.js +100 -44
- package/dist/mcp/provider.js.map +1 -1
- package/dist/messages/images/delete.msg.d.ts +3 -0
- package/dist/messages/images/delete.msg.d.ts.map +1 -0
- package/dist/messages/images/delete.msg.js +9 -0
- package/dist/messages/images/delete.msg.js.map +1 -0
- package/dist/messages/images/events.msg.d.ts +3 -0
- package/dist/messages/images/events.msg.d.ts.map +1 -0
- package/dist/messages/images/events.msg.js +9 -0
- package/dist/messages/images/events.msg.js.map +1 -0
- package/dist/messages/images/list.msg.d.ts +3 -0
- package/dist/messages/images/list.msg.d.ts.map +1 -0
- package/dist/messages/images/list.msg.js +9 -0
- package/dist/messages/images/list.msg.js.map +1 -0
- package/dist/messages/images/read.msg.d.ts +3 -0
- package/dist/messages/images/read.msg.d.ts.map +1 -0
- package/dist/messages/images/read.msg.js +9 -0
- package/dist/messages/images/read.msg.js.map +1 -0
- package/dist/messages/images/upload.msg.d.ts +3 -0
- package/dist/messages/images/upload.msg.d.ts.map +1 -0
- package/dist/messages/images/upload.msg.js +9 -0
- package/dist/messages/images/upload.msg.js.map +1 -0
- package/dist/messages/model-message.d.ts +8 -0
- package/dist/messages/model-message.d.ts.map +1 -0
- package/dist/messages/model-message.js +18 -0
- package/dist/messages/model-message.js.map +1 -0
- package/dist/migrations/index.d.ts +2 -0
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/index.js +50 -2
- package/dist/migrations/index.js.map +1 -1
- package/dist/models/delete-image.model.js +14 -7
- package/dist/models/delete-image.model.js.map +1 -1
- package/dist/models/list-image.model.js +6 -3
- package/dist/models/list-image.model.js.map +1 -1
- package/dist/models/read-image-event-catalog.model.d.ts +3 -0
- package/dist/models/read-image-event-catalog.model.d.ts.map +1 -0
- package/dist/models/read-image-event-catalog.model.js +7 -0
- package/dist/models/read-image-event-catalog.model.js.map +1 -0
- package/dist/models/read-image.model.js +2 -2
- package/dist/models/read-image.model.js.map +1 -1
- package/dist/models/upload-image.model.d.ts +6 -2
- package/dist/models/upload-image.model.d.ts.map +1 -1
- package/dist/models/upload-image.model.js +8 -7
- package/dist/models/upload-image.model.js.map +1 -1
- package/dist/persistence/entities.d.ts.map +1 -1
- package/dist/persistence/entities.js +85 -12
- package/dist/persistence/entities.js.map +1 -1
- package/dist/services/config.service.js.map +1 -1
- package/dist/services/database.service.js +9 -1
- package/dist/services/database.service.js.map +1 -1
- package/dist/services/images-runtime.service.js +4 -1
- package/dist/services/images-runtime.service.js.map +1 -1
- package/dist/services/mcp-provider.service.js +2 -1
- package/dist/services/mcp-provider.service.js.map +1 -1
- package/dist/services/redis.service.js +12 -4
- package/dist/services/redis.service.js.map +1 -1
- package/dist/storage/local-storage.d.ts.map +1 -1
- package/dist/storage/local-storage.js +13 -5
- package/dist/storage/local-storage.js.map +1 -1
- package/package.json +21 -21
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-image.model.js","sourceRoot":"","sources":["../../src/models/read-image.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAuB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAsB,MAAM,qCAAqC,CAAC;AAC1F,OAAO,oBAAoB,MAAM,uCAAuC,CAAC;AAEzE,eAAe,WAAW,
|
|
1
|
+
{"version":3,"file":"read-image.model.js","sourceRoot":"","sources":["../../src/models/read-image.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAuB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAsB,MAAM,qCAAqC,CAAC;AAC1F,OAAO,oBAAoB,MAAM,uCAAuC,CAAC;AAEzE,eAAe,WAAW,CACxB,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;IAC1B,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAClE,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvC,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IACnC,OAAO,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;AACxC,CAAC,CACF,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
import { type UploadImageInput } from '../domain/schema.js';
|
|
2
1
|
declare const _default: import("@hile/model").ModelDefinition<{
|
|
3
2
|
actor: string;
|
|
4
|
-
|
|
3
|
+
upload: {
|
|
4
|
+
idempotencyKey: string;
|
|
5
|
+
filename?: string | undefined;
|
|
6
|
+
source: "base64";
|
|
7
|
+
base64: string;
|
|
8
|
+
};
|
|
5
9
|
}, {
|
|
6
10
|
id: string;
|
|
7
11
|
originalFilename: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-image.model.d.ts","sourceRoot":"","sources":["../../src/models/upload-image.model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upload-image.model.d.ts","sourceRoot":"","sources":["../../src/models/upload-image.model.ts"],"names":[],"mappings":""}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
2
|
import { loadService } from '@hile/core';
|
|
3
3
|
import { defineModel } from '@hile/model';
|
|
4
|
+
import { imageUploadCommandSchema } from '@zlooks.cn/images-shared';
|
|
4
5
|
import { ImageError } from '../domain/image-error.js';
|
|
5
|
-
import { uploadImageSchema } from '../domain/schema.js';
|
|
6
6
|
import { inspectImage } from '../storage/inspect-image.js';
|
|
7
7
|
import { imageRelativePath } from '../storage/image-path.js';
|
|
8
8
|
import { readUploadBytes } from '../storage/read-upload-bytes.js';
|
|
@@ -10,12 +10,13 @@ import { imageProjection } from '../presentation/image-projection.js';
|
|
|
10
10
|
import imagesRuntimeService from '../services/images-runtime.service.js';
|
|
11
11
|
export default defineModel(async (input, invocation) => {
|
|
12
12
|
invocation.signal.throwIfAborted();
|
|
13
|
-
const
|
|
13
|
+
const command = imageUploadCommandSchema.parse(input);
|
|
14
|
+
const upload = command.upload;
|
|
14
15
|
const { store, storage, origin } = await loadService(imagesRuntimeService);
|
|
15
16
|
const signal = AbortSignal.any([invocation.signal, AbortSignal.timeout(45_000)]);
|
|
16
17
|
signal.throwIfAborted();
|
|
17
|
-
const hash = createHash('sha256').update(JSON.stringify(
|
|
18
|
-
const reserved = await store.reserve(
|
|
18
|
+
const hash = createHash('sha256').update(JSON.stringify(upload)).digest('hex');
|
|
19
|
+
const reserved = await store.reserve(command.actor, upload.idempotencyKey, hash, upload.filename ?? null);
|
|
19
20
|
if (!reserved.created) {
|
|
20
21
|
if (reserved.row.status === 'ready')
|
|
21
22
|
return imageProjection(reserved.row, origin());
|
|
@@ -23,7 +24,7 @@ export default defineModel(async (input, invocation) => {
|
|
|
23
24
|
}
|
|
24
25
|
const id = reserved.row.id;
|
|
25
26
|
try {
|
|
26
|
-
const bytes = await readUploadBytes(
|
|
27
|
+
const bytes = await readUploadBytes(upload, signal);
|
|
27
28
|
signal.throwIfAborted();
|
|
28
29
|
const metadata = await inspectImage(bytes);
|
|
29
30
|
signal.throwIfAborted();
|
|
@@ -35,13 +36,13 @@ export default defineModel(async (input, invocation) => {
|
|
|
35
36
|
return imageProjection(await store.read(id), origin());
|
|
36
37
|
}
|
|
37
38
|
catch (error) {
|
|
38
|
-
// Re-read before cleanup: a lost DB reply may conceal a successful ready commit.
|
|
39
39
|
const current = await store.read(id);
|
|
40
40
|
if (current.status === 'ready')
|
|
41
41
|
return imageProjection(current, origin());
|
|
42
42
|
if (current.status === 'uploading') {
|
|
43
43
|
await store.transition(id, 'uploading', {
|
|
44
|
-
status: 'failed',
|
|
44
|
+
status: 'failed',
|
|
45
|
+
failureCode: error instanceof ImageError ? error.code : 'UPLOAD_FAILED',
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
48
|
if (current.relativePath)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-image.model.js","sourceRoot":"","sources":["../../src/models/upload-image.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"upload-image.model.js","sourceRoot":"","sources":["../../src/models/upload-image.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,WAAW,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAClE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,WAAW,wBA4FtB,CAAC;AAEH,eAAO,MAAM,aAAa,mCAAyB,CAAC"}
|
|
@@ -1,23 +1,96 @@
|
|
|
1
1
|
import { EntitySchema } from 'typeorm';
|
|
2
2
|
export const ImageEntity = new EntitySchema({
|
|
3
|
-
name: 'Image',
|
|
3
|
+
name: 'Image',
|
|
4
|
+
tableName: 'images',
|
|
4
5
|
columns: {
|
|
5
|
-
id: {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
6
|
+
id: {
|
|
7
|
+
type: 'uuid',
|
|
8
|
+
primary: true,
|
|
9
|
+
},
|
|
10
|
+
createdBy: {
|
|
11
|
+
name: 'created_by',
|
|
12
|
+
type: 'varchar',
|
|
13
|
+
length: 128,
|
|
14
|
+
},
|
|
15
|
+
uploadIdempotencyKey: {
|
|
16
|
+
name: 'upload_idempotency_key',
|
|
17
|
+
type: 'varchar',
|
|
18
|
+
length: 128,
|
|
19
|
+
},
|
|
20
|
+
uploadRequestFingerprint: {
|
|
21
|
+
name: 'upload_request_fingerprint',
|
|
22
|
+
type: 'varchar',
|
|
23
|
+
length: 64,
|
|
24
|
+
},
|
|
25
|
+
status: {
|
|
26
|
+
type: 'varchar',
|
|
27
|
+
length: 16,
|
|
28
|
+
},
|
|
29
|
+
originalFilename: {
|
|
30
|
+
name: 'original_filename',
|
|
31
|
+
type: 'varchar',
|
|
32
|
+
length: 200,
|
|
33
|
+
nullable: true,
|
|
34
|
+
},
|
|
35
|
+
mediaType: {
|
|
36
|
+
name: 'media_type',
|
|
37
|
+
type: 'varchar',
|
|
38
|
+
length: 64,
|
|
39
|
+
nullable: true,
|
|
40
|
+
},
|
|
41
|
+
extension: {
|
|
42
|
+
type: 'varchar',
|
|
43
|
+
length: 8,
|
|
44
|
+
nullable: true,
|
|
45
|
+
},
|
|
46
|
+
byteSize: {
|
|
47
|
+
name: 'byte_size',
|
|
48
|
+
type: 'integer',
|
|
49
|
+
nullable: true,
|
|
50
|
+
},
|
|
51
|
+
width: {
|
|
52
|
+
type: 'integer',
|
|
53
|
+
nullable: true,
|
|
54
|
+
},
|
|
55
|
+
height: {
|
|
56
|
+
type: 'integer',
|
|
57
|
+
nullable: true,
|
|
58
|
+
},
|
|
59
|
+
sha256: {
|
|
60
|
+
type: 'varchar',
|
|
61
|
+
length: 64,
|
|
62
|
+
nullable: true,
|
|
63
|
+
},
|
|
64
|
+
relativePath: {
|
|
65
|
+
name: 'relative_path',
|
|
66
|
+
type: 'varchar',
|
|
67
|
+
length: 128,
|
|
68
|
+
nullable: true,
|
|
69
|
+
},
|
|
12
70
|
failureCode: { name: 'failure_code', type: 'varchar', length: 64, nullable: true },
|
|
13
71
|
createdAt: { name: 'created_at', type: 'timestamptz', precision: 3, createDate: true },
|
|
14
72
|
readyAt: { name: 'ready_at', type: 'timestamptz', precision: 3, nullable: true },
|
|
15
73
|
deletedAt: { name: 'deleted_at', type: 'timestamptz', precision: 3, nullable: true },
|
|
16
|
-
version: {
|
|
74
|
+
version: {
|
|
75
|
+
type: 'integer',
|
|
76
|
+
version: true,
|
|
77
|
+
default: 1,
|
|
78
|
+
},
|
|
17
79
|
},
|
|
18
|
-
uniques: [{
|
|
19
|
-
|
|
20
|
-
|
|
80
|
+
uniques: [{
|
|
81
|
+
name: 'images_upload_actor_key',
|
|
82
|
+
columns: ['createdBy', 'uploadIdempotencyKey'],
|
|
83
|
+
}],
|
|
84
|
+
checks: [{
|
|
85
|
+
name: 'chk_images_version',
|
|
86
|
+
expression: `"version" > 0`,
|
|
87
|
+
}],
|
|
88
|
+
indices: [
|
|
89
|
+
{ columns: ['createdAt', 'id'] },
|
|
90
|
+
{ columns: ['status', 'createdAt', 'id'] },
|
|
91
|
+
{ columns: ['createdBy', 'createdAt', 'id'] },
|
|
92
|
+
{ columns: ['sha256'] },
|
|
93
|
+
],
|
|
21
94
|
});
|
|
22
95
|
export const imageEntities = [ImageEntity];
|
|
23
96
|
//# sourceMappingURL=entities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/persistence/entities.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/services/config.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,eAAe,aAAa,CAAC,sBAAsB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACtE,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE;QAC5D,OAAO,EAAE;YACP,KAAK,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE;YACvE,QAAQ,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE;YAChF,UAAU,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE;SACvG;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/services/config.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,eAAe,aAAa,CAAC,sBAAsB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACtE,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,WAAW,EAAE;QAC5D,OAAO,EAAE;YACP,KAAK,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE;YACvE,QAAQ,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE;YAChF,UAAU,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE;SACvG;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;KACtG,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { defineService, loadService } from '@hile/core';
|
|
2
2
|
import { createDataSource } from '@hile/typeorm';
|
|
3
|
+
import { prepareImagesSchema } from '../migrations/index.js';
|
|
3
4
|
import { imageEntities } from '../persistence/entities.js';
|
|
4
5
|
import configService from './config.service.js';
|
|
5
6
|
export default defineService('zlooks.images.database', async (shutdown) => {
|
|
@@ -13,10 +14,17 @@ export default defineService('zlooks.images.database', async (shutdown) => {
|
|
|
13
14
|
database: config.database,
|
|
14
15
|
ssl: config.ssl,
|
|
15
16
|
poolSize: config.poolSize,
|
|
16
|
-
synchronize:
|
|
17
|
+
synchronize: false,
|
|
17
18
|
migrationsRun: false,
|
|
18
19
|
entities: [...imageEntities],
|
|
19
20
|
});
|
|
21
|
+
try {
|
|
22
|
+
await prepareImagesSchema(database);
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
await database.destroy();
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
20
28
|
shutdown(() => database.destroy());
|
|
21
29
|
return database;
|
|
22
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.service.js","sourceRoot":"","sources":["../../src/services/database.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,eAAe,aAAa,CAAC,wBAAwB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,CAAC,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACtE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC;QACtC,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"database.service.js","sourceRoot":"","sources":["../../src/services/database.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,eAAe,aAAa,CAAC,wBAAwB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,CAAC,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACtE,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC;QACtC,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,QAAQ,EAAE,CAAC,GAAG,aAAa,CAAC;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACnC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
|
@@ -10,7 +10,10 @@ import databaseService from './database.service.js';
|
|
|
10
10
|
import applicationService from './application.service.js';
|
|
11
11
|
export default defineService('zlooks.images.runtime', async () => {
|
|
12
12
|
const [database, configs, redis, application] = await Promise.all([
|
|
13
|
-
loadService(databaseService),
|
|
13
|
+
loadService(databaseService),
|
|
14
|
+
loadService(configService),
|
|
15
|
+
loadService(redisService),
|
|
16
|
+
loadService(applicationService),
|
|
14
17
|
]);
|
|
15
18
|
const store = new ImageStore(database, redis, `${configs.snapshot().redis.keyPrefix}images:public:v1:`, () => configs.snapshot().publicHost.origin, new ContextualEventPublisher(new EventClient(application), () => createExecutionContext({ source: 'cn.zlooks.images' })));
|
|
16
19
|
const storage = new LocalImageStorage();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"images-runtime.service.js","sourceRoot":"","sources":["../../src/services/images-runtime.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAC9C,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,eAAe,aAAa,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IAC/D,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,WAAW,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"images-runtime.service.js","sourceRoot":"","sources":["../../src/services/images-runtime.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAC9C,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,eAAe,aAAa,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IAC/D,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,WAAW,CAAC,eAAe,CAAC;QAC5B,WAAW,CAAC,aAAa,CAAC;QAC1B,WAAW,CAAC,YAAY,CAAC;QACzB,WAAW,CAAC,kBAAkB,CAAC;KAChC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,UAAU,CAC1B,QAAQ,EACR,KAAK,EACL,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,mBAAmB,EACxD,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,EAC1C,IAAI,wBAAwB,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAC9D,sBAAsB,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CACvD,CACF,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACxC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC3B,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACpC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;AAChF,CAAC,CAAC,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { defineService, loadService } from '@hile/core';
|
|
2
2
|
import { attachMcpProvider } from '@hile/mcp/micro';
|
|
3
|
+
import { createImagesMicroClient } from '@zlooks.cn/images-shared';
|
|
3
4
|
import { createImagesProvider } from '../mcp/provider.js';
|
|
4
5
|
import applicationService from './application.service.js';
|
|
5
6
|
import imagesRuntimeService from './images-runtime.service.js';
|
|
6
7
|
export default defineService('zlooks.images.mcp-provider', async (shutdown) => {
|
|
7
8
|
await loadService(imagesRuntimeService);
|
|
8
9
|
const application = await loadService(applicationService);
|
|
9
|
-
const attachment = await attachMcpProvider(application, createImagesProvider(), {
|
|
10
|
+
const attachment = await attachMcpProvider(application, createImagesProvider(createImagesMicroClient(application)), {
|
|
10
11
|
invocationSecurity: { mode: 'trusted-internal' },
|
|
11
12
|
});
|
|
12
13
|
shutdown(() => attachment.close());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-provider.service.js","sourceRoot":"","sources":["../../src/services/mcp-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,oBAAoB,MAAM,6BAA6B,CAAC;AAE/D,eAAe,aAAa,CAAC,4BAA4B,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAC5E,MAAM,WAAW,CAAC,oBAAoB,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"mcp-provider.service.js","sourceRoot":"","sources":["../../src/services/mcp-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,oBAAoB,MAAM,6BAA6B,CAAC;AAE/D,eAAe,aAAa,CAAC,4BAA4B,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAC5E,MAAM,WAAW,CAAC,oBAAoB,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,WAAW,EACX,oBAAoB,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,EAC1D;QACA,kBAAkB,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;KAC/C,CACF,CAAC;IACF,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC,CAAC"}
|
|
@@ -8,17 +8,25 @@ export default defineService('zlooks.images.redis', async (shutdown) => {
|
|
|
8
8
|
const config = configs.snapshot().redis;
|
|
9
9
|
let ready = false;
|
|
10
10
|
const redis = await createRedis({
|
|
11
|
-
host: config.host,
|
|
11
|
+
host: config.host,
|
|
12
|
+
port: config.port,
|
|
13
|
+
db: config.database,
|
|
12
14
|
...(config.username ? { username: config.username } : {}),
|
|
13
15
|
...(config.password ? { password: config.password } : {}),
|
|
14
16
|
...(config.tls ? { tls: {} } : {}),
|
|
15
|
-
connectTimeout: 3_000,
|
|
17
|
+
connectTimeout: 3_000,
|
|
18
|
+
commandTimeout: 3_000,
|
|
19
|
+
maxRetriesPerRequest: 1,
|
|
20
|
+
enableOfflineQueue: false,
|
|
16
21
|
// createRedis cannot expose a failed initial client for cleanup; stop initial retries.
|
|
17
|
-
retryStrategy: (attempt) => ready ? Math.min(attempt * 100, 1_000) : null,
|
|
22
|
+
retryStrategy: (attempt) => (ready ? Math.min(attempt * 100, 1_000) : null),
|
|
18
23
|
});
|
|
19
24
|
const onError = () => logger.warn('图片元数据缓存 Redis 连接异常');
|
|
20
25
|
redis.on('error', onError);
|
|
21
|
-
shutdown(() => {
|
|
26
|
+
shutdown(() => {
|
|
27
|
+
redis.disconnect();
|
|
28
|
+
redis.off('error', onError);
|
|
29
|
+
});
|
|
22
30
|
try {
|
|
23
31
|
// createRedis resolves at TCP connect; connect alone does not verify authentication/readiness.
|
|
24
32
|
if (redis.status !== 'ready')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.service.js","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,eAAe,aAAa,CAAC,qBAAqB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACrE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;IACxC,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"redis.service.js","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,eAAe,aAAa,CAAC,qBAAqB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IACrE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;IACxC,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,EAAE,EAAE,MAAM,CAAC,QAAQ;QACnB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;QACrB,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,KAAK;QACzB,uFAAuF;QACvF,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5E,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE;QACZ,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,+FAA+F;QAC/F,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;YAAE,MAAM,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACjG,KAAK,GAAG,IAAI,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-storage.d.ts","sourceRoot":"","sources":["../../src/storage/local-storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-storage.d.ts","sourceRoot":"","sources":["../../src/storage/local-storage.ts"],"names":[],"mappings":"AAQA,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,YAAY,IAAI,SAA0C,EAEzD;IACK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAOhC;IACD,OAAO,CAAC,IAAI;IAGN,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB5D;IACK,IAAI,CAAC,QAAQ,EAAE,MAAM,kDAE1B;IACK,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5C;CACF"}
|
|
@@ -7,7 +7,9 @@ import { z } from 'zod';
|
|
|
7
7
|
import { validateImagePath } from './image-path.js';
|
|
8
8
|
export class LocalImageStorage {
|
|
9
9
|
root;
|
|
10
|
-
constructor(root = join(homedir(), '.zlooks.cn', 'images')) {
|
|
10
|
+
constructor(root = join(homedir(), '.zlooks.cn', 'images')) {
|
|
11
|
+
this.root = resolve(root);
|
|
12
|
+
}
|
|
11
13
|
async initialize() {
|
|
12
14
|
const staging = join(this.root, '.staging');
|
|
13
15
|
await mkdir(staging, { recursive: true, mode: 0o700 });
|
|
@@ -42,7 +44,9 @@ export class LocalImageStorage {
|
|
|
42
44
|
await unlink(stage).catch(ignoreMissing);
|
|
43
45
|
}
|
|
44
46
|
}
|
|
45
|
-
async open(relative) {
|
|
47
|
+
async open(relative) {
|
|
48
|
+
return open(this.path(relative), constants.O_RDONLY | constants.O_NOFOLLOW);
|
|
49
|
+
}
|
|
46
50
|
async remove(relative) {
|
|
47
51
|
const target = this.path(relative);
|
|
48
52
|
await unlink(target).catch(ignoreMissing);
|
|
@@ -59,7 +63,11 @@ async function syncDirectory(path) {
|
|
|
59
63
|
await directory.close();
|
|
60
64
|
}
|
|
61
65
|
}
|
|
62
|
-
function hasCode(error, code) {
|
|
63
|
-
|
|
64
|
-
|
|
66
|
+
function hasCode(error, code) {
|
|
67
|
+
return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
|
|
68
|
+
}
|
|
69
|
+
function ignoreMissing(error) {
|
|
70
|
+
if (!hasCode(error, 'ENOENT'))
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
65
73
|
//# sourceMappingURL=local-storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-storage.js","sourceRoot":"","sources":["../../src/storage/local-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"local-storage.js","sourceRoot":"","sources":["../../src/storage/local-storage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zlooks.cn/images-server",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -25,26 +25,26 @@
|
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@hile/cache": "4.0.
|
|
29
|
-
"@hile/context": "4.0.
|
|
30
|
-
"@hile/core": "4.0.
|
|
31
|
-
"@hile/ioredis": "4.0.
|
|
32
|
-
"@hile/logger": "4.0.
|
|
33
|
-
"@hile/mcp": "1.0.
|
|
34
|
-
"@hile/message-loader": "4.0.
|
|
35
|
-
"@hile/micro": "4.0.
|
|
36
|
-
"@hile/model": "4.0.
|
|
37
|
-
"@hile/redis-lock": "4.0.
|
|
38
|
-
"@hile/typeorm": "4.0.
|
|
39
|
-
"@zlooks.cn/database-command": "1.0.
|
|
40
|
-
"@zlooks.cn/event-bus": "1.0.
|
|
41
|
-
"@zlooks.cn/event-client": "1.0.
|
|
42
|
-
"@zlooks.cn/images-shared": "1.0.
|
|
28
|
+
"@hile/cache": "4.0.2",
|
|
29
|
+
"@hile/context": "4.0.3",
|
|
30
|
+
"@hile/core": "4.0.2",
|
|
31
|
+
"@hile/ioredis": "4.0.2",
|
|
32
|
+
"@hile/logger": "4.0.2",
|
|
33
|
+
"@hile/mcp": "1.0.6",
|
|
34
|
+
"@hile/message-loader": "4.0.6",
|
|
35
|
+
"@hile/micro": "4.0.6",
|
|
36
|
+
"@hile/model": "4.0.4",
|
|
37
|
+
"@hile/redis-lock": "4.0.2",
|
|
38
|
+
"@hile/typeorm": "4.0.2",
|
|
39
|
+
"@zlooks.cn/database-command": "1.0.3",
|
|
40
|
+
"@zlooks.cn/event-bus": "1.0.2",
|
|
41
|
+
"@zlooks.cn/event-client": "1.0.2",
|
|
42
|
+
"@zlooks.cn/images-shared": "1.0.2",
|
|
43
43
|
"@zlooks.cn/infrastructure": "1.0.0",
|
|
44
|
-
"@zlooks.cn/public-asset": "1.0.
|
|
44
|
+
"@zlooks.cn/public-asset": "1.0.2",
|
|
45
45
|
"@zlooks.cn/public-host-contract": "1.0.0",
|
|
46
|
-
"@zlooks.cn/registry-config": "1.0.
|
|
47
|
-
"@zlooks.cn/service-command": "1.0.
|
|
46
|
+
"@zlooks.cn/registry-config": "1.0.1",
|
|
47
|
+
"@zlooks.cn/service-command": "1.0.1",
|
|
48
48
|
"@zlooks.cn/utils": "1.0.0",
|
|
49
49
|
"detect-port": "2.1.0",
|
|
50
50
|
"ioredis": "5.11.1",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"start": "hile start --env-file ~/.zlooks.cn/.env"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@hile/cli": "4.0.
|
|
66
|
+
"@hile/cli": "4.0.7",
|
|
67
67
|
"@types/node": "26.2.0",
|
|
68
68
|
"@types/range-parser": "1.2.7",
|
|
69
69
|
"fix-esm-import-path": "1.10.3",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"typescript": "7.0.2",
|
|
72
72
|
"vitest": "4.1.11"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "3c7e3ec494a3702626a2b150991b136b89550e35"
|
|
75
75
|
}
|