@strapi/data-transfer 4.11.2 → 4.11.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/engine/diagnostic.d.ts +1 -1
- package/dist/strapi/providers/local-destination/index.d.ts +1 -1
- package/dist/strapi/providers/local-destination/index.js.map +1 -1
- package/dist/strapi/providers/remote-destination/index.d.ts +2 -5
- package/dist/strapi/providers/remote-destination/index.js.map +1 -1
- package/dist/strapi/providers/remote-source/index.d.ts +4 -6
- package/dist/strapi/providers/remote-source/index.js +46 -17
- package/dist/strapi/providers/remote-source/index.js.map +1 -1
- package/dist/strapi/remote/handlers/pull.js +53 -4
- package/dist/strapi/remote/handlers/pull.js.map +1 -1
- package/package.json +4 -4
|
@@ -11,7 +11,7 @@ export type GenericDiagnostic<K extends DiagnosticKind, T = unknown> = {
|
|
|
11
11
|
export type DiagnosticKind = 'error' | 'warning' | 'info';
|
|
12
12
|
export type DiagnosticListener<T extends DiagnosticKind = DiagnosticKind> = (diagnostic: {
|
|
13
13
|
kind: T;
|
|
14
|
-
} & Diagnostic extends infer U ? U :
|
|
14
|
+
} & Diagnostic extends infer U ? U : never) => void | Promise<void>;
|
|
15
15
|
export type DiagnosticEvent = 'diagnostic' | `diagnostic.${DiagnosticKind}`;
|
|
16
16
|
export type GetEventListener<E extends DiagnosticEvent> = E extends 'diagnostic' ? DiagnosticListener : E extends `diagnostic.${infer K}` ? K extends DiagnosticKind ? DiagnosticListener<K> : never : never;
|
|
17
17
|
export type Diagnostic = ErrorDiagnostic | WarningDiagnostic | InfoDiagnostic;
|
|
@@ -8,7 +8,7 @@ export interface ILocalStrapiDestinationProviderOptions {
|
|
|
8
8
|
getStrapi(): Strapi.Strapi | Promise<Strapi.Strapi>;
|
|
9
9
|
autoDestroy?: boolean;
|
|
10
10
|
restore?: restore.IRestoreOptions;
|
|
11
|
-
strategy: 'restore'
|
|
11
|
+
strategy: 'restore';
|
|
12
12
|
}
|
|
13
13
|
declare class LocalStrapiDestinationProvider implements IDestinationProvider {
|
|
14
14
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/local-destination/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,gDAAwB;AACxB,8CAAgC;AAShC,6CAAuC;AACvC,sDAAwC;AACxC,yDAA2F;AAC3F,wDAA6D;AAEhD,QAAA,yBAAyB,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACjD,QAAA,yBAAyB,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/local-destination/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,11 @@ import { Writable } from 'stream';
|
|
|
4
4
|
import type { Schema, Utils } from '@strapi/strapi';
|
|
5
5
|
import { createDispatcher } from '../utils';
|
|
6
6
|
import type { IDestinationProvider, IMetadata, ProviderType } from '../../../../types';
|
|
7
|
+
import type { Auth } from '../../../../types/remote/protocol';
|
|
7
8
|
import type { ILocalStrapiDestinationProviderOptions } from '../local-destination';
|
|
8
|
-
interface ITransferTokenAuth {
|
|
9
|
-
type: 'token';
|
|
10
|
-
token: string;
|
|
11
|
-
}
|
|
12
9
|
export interface IRemoteStrapiDestinationProviderOptions extends Pick<ILocalStrapiDestinationProviderOptions, 'restore' | 'strategy'> {
|
|
13
10
|
url: URL;
|
|
14
|
-
auth?: ITransferTokenAuth;
|
|
11
|
+
auth?: Auth.ITransferTokenAuth;
|
|
15
12
|
retryMessageOptions?: {
|
|
16
13
|
retryMessageTimeout: number;
|
|
17
14
|
retryMessageMaxRetries: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/remote-destination/index.ts"],"names":[],"mappings":";;;;;;;;;AACA,mCAAoC;AACpC,mCAAkC;AAClC,kCAAiC;AAGjC,oCAAmF;AAKnF,sDAAuD;AACvD,yDAA2F;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/remote-destination/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Schema, Utils } from '@strapi/strapi';
|
|
3
|
-
import { Readable } from 'stream';
|
|
3
|
+
import { Readable, Writable } from 'stream';
|
|
4
4
|
import { WebSocket } from 'ws';
|
|
5
5
|
import type { IMetadata, ISourceProvider, ISourceProviderTransferResults, MaybePromise, ProviderType } from '../../../../types';
|
|
6
|
+
import { Auth } from '../../../../types/remote/protocol';
|
|
6
7
|
import { ILocalStrapiSourceProviderOptions } from '../local-source';
|
|
7
8
|
import { createDispatcher } from '../utils';
|
|
8
|
-
interface ITransferTokenAuth {
|
|
9
|
-
type: 'token';
|
|
10
|
-
token: string;
|
|
11
|
-
}
|
|
12
9
|
export interface IRemoteStrapiSourceProviderOptions extends ILocalStrapiSourceProviderOptions {
|
|
13
10
|
url: URL;
|
|
14
|
-
auth?: ITransferTokenAuth;
|
|
11
|
+
auth?: Auth.ITransferTokenAuth;
|
|
15
12
|
retryMessageOptions?: {
|
|
16
13
|
retryMessageTimeout: number;
|
|
17
14
|
retryMessageMaxRetries: number;
|
|
@@ -28,6 +25,7 @@ declare class RemoteStrapiSourceProvider implements ISourceProvider {
|
|
|
28
25
|
results?: ISourceProviderTransferResults | undefined;
|
|
29
26
|
createEntitiesReadStream(): MaybePromise<Readable>;
|
|
30
27
|
createLinksReadStream(): MaybePromise<Readable>;
|
|
28
|
+
writeAsync: <T>(stream: Writable, data: T) => Promise<void>;
|
|
31
29
|
createAssetsReadStream(): Promise<Readable>;
|
|
32
30
|
createConfigurationReadStream(): MaybePromise<Readable>;
|
|
33
31
|
getMetadata(): Promise<IMetadata | null>;
|
|
@@ -8,6 +8,7 @@ var _RemoteStrapiSourceProvider_instances, _RemoteStrapiSourceProvider_createSta
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.createRemoteStrapiSourceProvider = void 0;
|
|
10
10
|
const stream_1 = require("stream");
|
|
11
|
+
const fp_1 = require("lodash/fp");
|
|
11
12
|
const providers_1 = require("../../../errors/providers");
|
|
12
13
|
const constants_1 = require("../../remote/constants");
|
|
13
14
|
const utils_1 = require("../utils");
|
|
@@ -16,6 +17,16 @@ class RemoteStrapiSourceProvider {
|
|
|
16
17
|
_RemoteStrapiSourceProvider_instances.add(this);
|
|
17
18
|
this.name = 'source::remote-strapi';
|
|
18
19
|
this.type = 'source';
|
|
20
|
+
this.writeAsync = (stream, data) => {
|
|
21
|
+
return new Promise((resolve, reject) => {
|
|
22
|
+
stream.write(data, (error) => {
|
|
23
|
+
if (error) {
|
|
24
|
+
reject(error);
|
|
25
|
+
}
|
|
26
|
+
resolve();
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
};
|
|
19
30
|
this.options = options;
|
|
20
31
|
this.ws = null;
|
|
21
32
|
this.dispatcher = null;
|
|
@@ -31,23 +42,37 @@ class RemoteStrapiSourceProvider {
|
|
|
31
42
|
const stream = await __classPrivateFieldGet(this, _RemoteStrapiSourceProvider_instances, "m", _RemoteStrapiSourceProvider_createStageReadStream).call(this, 'assets');
|
|
32
43
|
const pass = new stream_1.PassThrough({ objectMode: true });
|
|
33
44
|
stream
|
|
34
|
-
.on('data', (
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
//
|
|
44
|
-
|
|
45
|
+
.on('data', async (payload) => {
|
|
46
|
+
for (const item of payload) {
|
|
47
|
+
const { action } = item;
|
|
48
|
+
// Creates the stream to send the incoming asset through
|
|
49
|
+
if (action === 'start') {
|
|
50
|
+
// Each asset has its own stream identified by its assetID
|
|
51
|
+
assets[item.assetID] = { ...item.data, stream: new stream_1.PassThrough() };
|
|
52
|
+
await this.writeAsync(pass, assets[item.assetID]);
|
|
53
|
+
}
|
|
54
|
+
// Writes the asset data to the created stream
|
|
55
|
+
else if (action === 'stream') {
|
|
56
|
+
// Converts data into buffer
|
|
57
|
+
const rawBuffer = item.data;
|
|
58
|
+
const chunk = Buffer.from(rawBuffer.data);
|
|
59
|
+
await this.writeAsync(assets[item.assetID].stream, chunk);
|
|
60
|
+
}
|
|
61
|
+
// The asset has been transferred
|
|
62
|
+
else if (action === 'end') {
|
|
63
|
+
await new Promise((resolve, reject) => {
|
|
64
|
+
const { stream: assetStream } = assets[item.assetID];
|
|
65
|
+
assetStream
|
|
66
|
+
.on('close', () => {
|
|
67
|
+
// Deletes the stream for the asset
|
|
68
|
+
delete assets[item.assetID];
|
|
69
|
+
resolve();
|
|
70
|
+
})
|
|
71
|
+
.on('error', reject)
|
|
72
|
+
.end();
|
|
73
|
+
});
|
|
74
|
+
}
|
|
45
75
|
}
|
|
46
|
-
})
|
|
47
|
-
.on('end', () => {
|
|
48
|
-
Object.values(assets).forEach((s) => {
|
|
49
|
-
s.push(null);
|
|
50
|
-
});
|
|
51
76
|
})
|
|
52
77
|
.on('close', () => {
|
|
53
78
|
pass.end();
|
|
@@ -158,7 +183,11 @@ _RemoteStrapiSourceProvider_instances = new WeakSet(), _RemoteStrapiSourceProvid
|
|
|
158
183
|
stream.destroy(error);
|
|
159
184
|
return;
|
|
160
185
|
}
|
|
161
|
-
|
|
186
|
+
// if we get a single items instead of a batch
|
|
187
|
+
// TODO V5: in v5 only allow array
|
|
188
|
+
for (const item of (0, fp_1.castArray)(data)) {
|
|
189
|
+
stream.push(item);
|
|
190
|
+
}
|
|
162
191
|
this.ws?.once('message', listener);
|
|
163
192
|
await __classPrivateFieldGet(this, _RemoteStrapiSourceProvider_instances, "m", _RemoteStrapiSourceProvider_respond).call(this, uuid);
|
|
164
193
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/remote-source/index.ts"],"names":[],"mappings":";;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/strapi/providers/remote-source/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,15 +87,34 @@ exports.createPullController = (0, utils_1.handlerControllerFactory)((proto) =>
|
|
|
87
87
|
this.assertValidTransferAction(action);
|
|
88
88
|
return this.provider?.[action]();
|
|
89
89
|
},
|
|
90
|
-
// TODO: Optimize performances (batching, client packets reconstruction, etc...)
|
|
91
90
|
async flush(stage, id) {
|
|
91
|
+
const batchSize = 1024 * 1024;
|
|
92
|
+
let batch = [];
|
|
92
93
|
const stream = this.streams?.[stage];
|
|
94
|
+
const batchLength = () => Buffer.byteLength(JSON.stringify(batch));
|
|
95
|
+
const sendBatch = async () => {
|
|
96
|
+
await this.confirm({
|
|
97
|
+
type: 'transfer',
|
|
98
|
+
data: batch,
|
|
99
|
+
ended: false,
|
|
100
|
+
error: null,
|
|
101
|
+
id,
|
|
102
|
+
});
|
|
103
|
+
};
|
|
93
104
|
if (!stream) {
|
|
94
105
|
throw new providers_2.ProviderTransferError(`No available stream found for ${stage}`);
|
|
95
106
|
}
|
|
96
107
|
try {
|
|
97
108
|
for await (const chunk of stream) {
|
|
98
|
-
|
|
109
|
+
batch.push(chunk);
|
|
110
|
+
if (batchLength() >= batchSize) {
|
|
111
|
+
await sendBatch();
|
|
112
|
+
batch = [];
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
if (batch.length > 0) {
|
|
116
|
+
await sendBatch();
|
|
117
|
+
batch = [];
|
|
99
118
|
}
|
|
100
119
|
await this.confirm({ type: 'transfer', data: null, ended: true, error: null, id });
|
|
101
120
|
}
|
|
@@ -132,15 +151,45 @@ exports.createPullController = (0, utils_1.handlerControllerFactory)((proto) =>
|
|
|
132
151
|
configuration: () => this.provider?.createConfigurationReadStream(),
|
|
133
152
|
assets: () => {
|
|
134
153
|
const assets = this.provider?.createAssetsReadStream();
|
|
154
|
+
let batch = [];
|
|
155
|
+
const batchLength = () => {
|
|
156
|
+
return batch.reduce((acc, chunk) => (chunk.action === 'stream' ? acc + chunk.data.byteLength : acc), 0);
|
|
157
|
+
};
|
|
158
|
+
const BATCH_MAX_SIZE = 1024 * 1024; // 1MB
|
|
135
159
|
if (!assets) {
|
|
136
160
|
throw new Error('bad');
|
|
137
161
|
}
|
|
162
|
+
/**
|
|
163
|
+
* Generates batches of 1MB of data from the assets stream to avoid
|
|
164
|
+
* sending too many small chunks
|
|
165
|
+
*
|
|
166
|
+
* @param stream Assets stream from the local source provider
|
|
167
|
+
*/
|
|
138
168
|
async function* generator(stream) {
|
|
169
|
+
let hasStarted = false;
|
|
170
|
+
let assetID = '';
|
|
139
171
|
for await (const chunk of stream) {
|
|
140
|
-
const { stream: assetStream, ...
|
|
172
|
+
const { stream: assetStream, ...assetData } = chunk;
|
|
173
|
+
if (!hasStarted) {
|
|
174
|
+
assetID = (0, crypto_1.randomUUID)();
|
|
175
|
+
// Start the transfer of a new asset
|
|
176
|
+
batch.push({ action: 'start', assetID, data: assetData });
|
|
177
|
+
hasStarted = true;
|
|
178
|
+
}
|
|
141
179
|
for await (const assetChunk of assetStream) {
|
|
142
|
-
|
|
180
|
+
// Add the asset data to the batch
|
|
181
|
+
batch.push({ action: 'stream', assetID, data: assetChunk });
|
|
182
|
+
// if the batch size is bigger than BATCH_MAX_SIZE stream the batch
|
|
183
|
+
if (batchLength() >= BATCH_MAX_SIZE) {
|
|
184
|
+
yield batch;
|
|
185
|
+
batch = [];
|
|
186
|
+
}
|
|
143
187
|
}
|
|
188
|
+
// All the asset data has been streamed and gets ready for the next one
|
|
189
|
+
hasStarted = false;
|
|
190
|
+
batch.push({ action: 'end', assetID });
|
|
191
|
+
yield batch;
|
|
192
|
+
batch = [];
|
|
144
193
|
}
|
|
145
194
|
}
|
|
146
195
|
return stream_1.Readable.from(generator(assets));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/strapi/remote/handlers/pull.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAClC,mCAAoC;AAGpC,mCAA0E;AAC1E,+CAA8F;AAC9F,yDAAkE;
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/strapi/remote/handlers/pull.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@strapi/data-transfer",
|
|
3
|
-
"version": "4.11.
|
|
3
|
+
"version": "4.11.4",
|
|
4
4
|
"description": "Data transfer capabilities for Strapi",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"strapi",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"./dist"
|
|
41
41
|
],
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@strapi/logger": "4.11.
|
|
44
|
-
"@strapi/strapi": "4.11.
|
|
43
|
+
"@strapi/logger": "4.11.4",
|
|
44
|
+
"@strapi/strapi": "4.11.4",
|
|
45
45
|
"chalk": "4.1.2",
|
|
46
46
|
"fs-extra": "10.0.0",
|
|
47
47
|
"lodash": "4.17.21",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"node": ">=14.19.1 <=18.x.x",
|
|
74
74
|
"npm": ">=6.0.0"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "8d325a695386ab9b578b360bf768cfa25173050f"
|
|
77
77
|
}
|