@uppy/transloadit: simplify plugin to always run a single assembly #5158
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff output filesdiff --git a/packages/@uppy/transloadit/lib/Client.js b/packages/@uppy/transloadit/lib/Client.js
index 798d3da..fbfcef1 100644
--- a/packages/@uppy/transloadit/lib/Client.js
+++ b/packages/@uppy/transloadit/lib/Client.js
@@ -126,29 +126,9 @@ export default class Client {
})
);
}
- async updateNumberOfFilesInAssembly(assembly, num_expected_upload_files) {
- const url = new URL(assembly.assembly_ssl_url);
- url.pathname = "/update_assemblies";
- const body = JSON.stringify({
- assembly_updates: [{
- assembly_id: assembly.assembly_id,
- num_expected_upload_files,
- }],
- });
- return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
- method: "POST",
- headers: _classPrivateFieldLooseBase(this, _headers)[_headers],
- body,
- }).catch(err =>
- _classPrivateFieldLooseBase(this, _reportError)[_reportError](err, {
- url,
- type: "API_ERROR",
- })
- );
- }
async cancelAssembly(assembly) {
const url = assembly.assembly_ssl_url;
- return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
+ await _classPrivateFieldLooseBase(this, _fetchWithNetworkError)[_fetchWithNetworkError](url, {
method: "DELETE",
headers: _classPrivateFieldLooseBase(this, _headers)[_headers],
}).catch(err =>
diff --git a/packages/@uppy/transloadit/lib/index.js b/packages/@uppy/transloadit/lib/index.js
index 123fa1f..9b8ba7e 100644
--- a/packages/@uppy/transloadit/lib/index.js
+++ b/packages/@uppy/transloadit/lib/index.js
@@ -14,22 +14,12 @@ import ErrorWithCause from "@uppy/utils/lib/ErrorWithCause";
import hasProperty from "@uppy/utils/lib/hasProperty";
import { RateLimitedQueue } from "@uppy/utils/lib/RateLimitedQueue";
import Assembly from "./Assembly.js";
-import AssemblyOptionsBuilder from "./AssemblyOptions.js";
import AssemblyWatcher from "./AssemblyWatcher.js";
import Client from "./Client.js";
import locale from "./locale.js";
const packageJson = {
"version": "4.0.0-beta.6",
};
-const sendErrorToConsole = originalErr => err => {
- const error = new ErrorWithCause("Failed to send error to the client", {
- cause: err,
- });
- console.error(error, originalErr);
-};
-const COMPANION_URL = "https://api2.transloadit.com/companion";
-const COMPANION_ALLOWED_HOSTS = /\.transloadit\.com$/;
-const TL_COMPANION = /https?:\/\/api2(?:-\w+)?\.transloadit\.com\/companion/;
const defaultOptions = {
service: "https://api2.transloadit.com",
errorReporting: true,
@@ -41,6 +31,35 @@ const defaultOptions = {
retryDelays: [7000, 10000, 15000, 20000],
clientName: null,
};
+const sendErrorToConsole = originalErr => err => {
+ const error = new ErrorWithCause("Failed to send error to the client", {
+ cause: err,
+ });
+ console.error(error, originalErr);
+};
+function validateParams(params) {
+ if (params == null) {
+ throw new Error("Transloadit: The `params` option is required.");
+ }
+ if (typeof params === "string") {
+ try {
+ params = JSON.parse(params);
+ } catch (err) {
+ throw new ErrorWithCause("Transloadit: The `params` option is a malformed JSON string.", {
+ cause: err,
+ });
+ }
+ }
+ if (!params.auth || !params.auth.key) {
+ throw new Error(
+ "Transloadit: The `params.auth.key` option is required. "
+ + "You can find your Transloadit API key at https://transloadit.com/c/template-credentials",
+ );
+ }
+}
+const COMPANION_URL = "https://api2.transloadit.com/companion";
+const COMPANION_ALLOWED_HOSTS = /\.transloadit\.com$/;
+const TL_COMPANION = /https?:\/\/api2(?:-\w+)?\.transloadit\.com\/companion/;
var _rateLimitedQueue = _classPrivateFieldLooseKey("rateLimitedQueue");
var _getClientVersion = _classPrivateFieldLooseKey("getClientVersion");
var _attachAssemblyMetadata = _classPrivateFieldLooseKey("attachAssemblyMetadata");
@@ -118,12 +137,11 @@ export default class Transloadit extends BasePlugin {
return;
}
const {
- assemblies,
- } = this.getPluginState();
- const assembly = assemblies[file.transloadit.assembly];
- this.client.addFile(assembly, file).catch(err => {
+ status,
+ } = this.assembly;
+ this.client.addFile(status, file).catch(err => {
this.uppy.log(err);
- this.uppy.emit("transloadit:import-error", assembly, file.id, err);
+ this.uppy.emit("transloadit:import-error", status, file.id, err);
});
},
});
@@ -131,14 +149,7 @@ export default class Transloadit extends BasePlugin {
writable: true,
value: async () => {
try {
- const {
- uploadsAssemblies,
- } = this.getPluginState();
- const assemblyIDs = Object.values(uploadsAssemblies).flat(1);
- const assemblies = assemblyIDs.map(assemblyID => this.getAssembly(assemblyID));
- await Promise.all(
- assemblies.map(assembly => _classPrivateFieldLooseBase(this, _cancelAssembly)[_cancelAssembly](assembly)),
- );
+ await _classPrivateFieldLooseBase(this, _cancelAssembly)[_cancelAssembly](this.assembly.status);
} catch (err) {
this.uppy.log(err);
}
@@ -147,90 +158,71 @@ export default class Transloadit extends BasePlugin {
Object.defineProperty(this, _getPersistentData, {
writable: true,
value: setData => {
- const {
- assemblies,
- uploadsAssemblies,
- } = this.getPluginState();
- setData({
- [this.id]: {
- assemblies,
- uploadsAssemblies,
- },
- });
+ if (this.assembly) {
+ setData({
+ [this.id]: {
+ assemblyResponse: this.assembly.status,
+ },
+ });
+ }
},
});
Object.defineProperty(this, _onRestored, {
writable: true,
value: pluginData => {
const savedState = pluginData && pluginData[this.id] ? pluginData[this.id] : {};
- const previousAssemblies = savedState.assemblies || {};
- const uploadsAssemblies = savedState.uploadsAssemblies || {};
- if (Object.keys(uploadsAssemblies).length === 0) {
+ const previousAssembly = savedState.assemblyResponse;
+ if (!previousAssembly) {
return;
}
- const restoreState = assemblies => {
+ const restoreState = () => {
const files = {};
const results = [];
- for (const [id, status] of Object.entries(assemblies)) {
- status.uploads.forEach(uploadedFile => {
- const file = _classPrivateFieldLooseBase(this, _findFile)[_findFile](uploadedFile);
- files[uploadedFile.id] = {
- id: file.id,
+ const {
+ assembly_id: id,
+ } = previousAssembly;
+ previousAssembly.uploads.forEach(uploadedFile => {
+ const file = _classPrivateFieldLooseBase(this, _findFile)[_findFile](uploadedFile);
+ files[uploadedFile.id] = {
+ id: file.id,
+ assembly: id,
+ uploadedFile,
+ };
+ });
+ const state = this.getPluginState();
+ Object.keys(previousAssembly.results).forEach(stepName => {
+ for (const result of previousAssembly.results[stepName]) {
+ const file = state.files[result.original_id];
+ result.localId = file ? file.id : null;
+ results.push({
+ id: result.id,
+ result,
+ stepName,
assembly: id,
- uploadedFile,
- };
- });
- const state = this.getPluginState();
- Object.keys(status.results).forEach(stepName => {
- for (const result of status.results[stepName]) {
- const file = state.files[result.original_id];
- result.localId = file ? file.id : null;
- results.push({
- id: result.id,
- result,
- stepName,
- assembly: id,
- });
- }
- });
- }
+ });
+ }
+ });
+ this.assembly = new Assembly(
+ previousAssembly,
+ _classPrivateFieldLooseBase(this, _rateLimitedQueue)[_rateLimitedQueue],
+ );
+ this.assembly.status = previousAssembly;
this.setPluginState({
- assemblies,
files,
results,
- uploadsAssemblies,
});
};
const restoreAssemblies = () => {
- const {
- assemblies,
- uploadsAssemblies,
- } = this.getPluginState();
- Object.keys(uploadsAssemblies).forEach(uploadID => {
- const assemblyIDs = uploadsAssemblies[uploadID];
- _classPrivateFieldLooseBase(this, _createAssemblyWatcher)[_createAssemblyWatcher](assemblyIDs, uploadID);
- });
- const allAssemblyIDs = Object.keys(assemblies);
- allAssemblyIDs.forEach(id => {
- const assembly = new Assembly(
- assemblies[id],
- _classPrivateFieldLooseBase(this, _rateLimitedQueue)[_rateLimitedQueue],
- );
- _classPrivateFieldLooseBase(this, _connectAssembly)[_connectAssembly](assembly);
- });
+ _classPrivateFieldLooseBase(this, _createAssemblyWatcher)[_createAssemblyWatcher](
+ previousAssembly.assembly_id,
+ );
+ _classPrivateFieldLooseBase(this, _connectAssembly)[_connectAssembly](this.assembly);
};
const updateAssemblies = () => {
- const {
- assemblies,
- } = this.getPluginState();
- return Promise.all(
- Object.keys(assemblies).map(id => {
- return this.activeAssemblies[id].update();
- }),
- );
+ return this.assembly.update();
};
this.restored = Promise.resolve().then(() => {
- restoreState(previousAssemblies);
+ restoreState();
restoreAssemblies();
updateAssemblies();
});
@@ -242,73 +234,37 @@ export default class Transloadit extends BasePlugin {
Object.defineProperty(this, _prepareUpload, {
writable: true,
value: async (fileIDs, uploadID) => {
- const files = fileIDs.map(id => this.uppy.getFile(id));
- const filesWithoutErrors = files.filter(file => {
- if (!file.error) {
- this.uppy.emit("preprocess-progress", file, {
- mode: "indeterminate",
- message: this.i18n("creatingAssembly"),
- });
- return true;
- }
- return false;
- });
- const createAssembly = async _ref => {
- let {
+ var _assemblyOptions$fiel;
+ const assemblyOptions = typeof this.opts.assemblyOptions === "function"
+ ? await this.opts.assemblyOptions()
+ : this.opts.assemblyOptions;
+ (_assemblyOptions$fiel = assemblyOptions.fields) != null ? _assemblyOptions$fiel : assemblyOptions.fields = {};
+ validateParams(assemblyOptions.params);
+ try {
+ const assembly = await _classPrivateFieldLooseBase(this, _createAssembly)[_createAssembly](
fileIDs,
- options,
- } = _ref;
- try {
- const assembly = await _classPrivateFieldLooseBase(this, _createAssembly)[_createAssembly](
- fileIDs,
- uploadID,
- options,
- );
- if (this.opts.importFromUploadURLs) {
- await _classPrivateFieldLooseBase(this, _reserveFiles)[_reserveFiles](assembly, fileIDs);
- }
- fileIDs.forEach(fileID => {
- const file = this.uppy.getFile(fileID);
- this.uppy.emit("preprocess-complete", file);
- });
- return assembly;
- } catch (err) {
- fileIDs.forEach(fileID => {
- const file = this.uppy.getFile(fileID);
- this.uppy.emit("preprocess-complete", file);
- this.uppy.emit("upload-error", file, err);
- });
- throw err;
+ uploadID,
+ assemblyOptions,
+ );
+ if (this.opts.importFromUploadURLs) {
+ await _classPrivateFieldLooseBase(this, _reserveFiles)[_reserveFiles](assembly, fileIDs);
}
- };
- const {
- uploadsAssemblies,
- } = this.getPluginState();
- this.setPluginState({
- uploadsAssemblies: {
- ...uploadsAssemblies,
- [uploadID]: [],
- },
- });
- const builder = new AssemblyOptionsBuilder(filesWithoutErrors, this.opts);
- await builder.build().then(assemblies => Promise.all(assemblies.map(createAssembly))).then(
- maybeCreatedAssemblies => {
- const createdAssemblies = maybeCreatedAssemblies.filter(Boolean);
- const assemblyIDs = createdAssemblies.map(assembly => assembly.status.assembly_id);
- _classPrivateFieldLooseBase(this, _createAssemblyWatcher)[_createAssemblyWatcher](assemblyIDs, uploadID);
- return Promise.all(
- createdAssemblies.map(assembly =>
- _classPrivateFieldLooseBase(this, _connectAssembly)[_connectAssembly](assembly)
- ),
- );
- },
- ).catch(err => {
- filesWithoutErrors.forEach(file => {
+ fileIDs.forEach(fileID => {
+ const file = this.uppy.getFile(fileID);
+ this.uppy.emit("preprocess-complete", file);
+ });
+ _classPrivateFieldLooseBase(this, _createAssemblyWatcher)[_createAssemblyWatcher](
+ assembly.status.assembly_id,
+ );
+ _classPrivateFieldLooseBase(this, _connectAssembly)[_connectAssembly](assembly);
+ } catch (err) {
+ fileIDs.forEach(fileID => {
+ const file = this.uppy.getFile(fileID);
this.uppy.emit("preprocess-complete", file);
this.uppy.emit("upload-error", file, err);
});
throw err;
- });
+ }
},
});
Object.defineProperty(this, _afterUpload, {
@@ -316,29 +272,23 @@ export default class Transloadit extends BasePlugin {
value: (fileIDs, uploadID) => {
const files = fileIDs.map(fileID => this.uppy.getFile(fileID));
const filteredFileIDs = files.filter(file => !file.error).map(file => file.id);
- const state = this.getPluginState();
if (this.restored) {
return this.restored.then(() => {
return _classPrivateFieldLooseBase(this, _afterUpload)[_afterUpload](filteredFileIDs, uploadID);
});
}
- const assemblyIDs = state.uploadsAssemblies[uploadID];
+ const assemblyID = this.assembly.status.assembly_id;
const closeSocketConnections = () => {
- assemblyIDs.forEach(assemblyID => {
- const assembly = this.activeAssemblies[assemblyID];
- assembly.close();
- delete this.activeAssemblies[assemblyID];
- });
+ this.assembly.close();
};
if (!_classPrivateFieldLooseBase(this, _shouldWaitAfterUpload)[_shouldWaitAfterUpload]()) {
closeSocketConnections();
- const assemblies = assemblyIDs.map(id => this.getAssembly(id));
this.uppy.addResultData(uploadID, {
- transloadit: assemblies,
+ transloadit: [this.assembly.status],
});
return Promise.resolve();
}
- if (assemblyIDs.length === 0) {
+ if (assemblyID.length === 0) {
this.uppy.addResultData(uploadID, {
transloadit: [],
});
@@ -351,29 +301,19 @@ export default class Transloadit extends BasePlugin {
message: this.i18n("encoding"),
});
});
- const watcher = this.assemblyWatchers[uploadID];
- return watcher.promise.then(() => {
+ return this.watcher.promise.then(() => {
closeSocketConnections();
- const assemblies = assemblyIDs.map(id => this.getAssembly(id));
- const uploadsAssemblies = {
- ...this.getPluginState().uploadsAssemblies,
- };
- delete uploadsAssemblies[uploadID];
- this.setPluginState({
- uploadsAssemblies,
- });
this.uppy.addResultData(uploadID, {
- transloadit: assemblies,
+ transloadit: [this.assembly.status],
});
});
},
});
Object.defineProperty(this, _closeAssemblyIfExists, {
writable: true,
- value: assemblyID => {
- var _this$activeAssemblie;
- if (!assemblyID) return;
- (_this$activeAssemblie = this.activeAssemblies[assemblyID]) == null || _this$activeAssemblie.close();
+ value: () => {
+ var _this$assembly;
+ (_this$assembly = this.assembly) == null || _this$assembly.close();
},
});
Object.defineProperty(this, _onError, {
@@ -384,11 +324,9 @@ export default class Transloadit extends BasePlugin {
});
Object.defineProperty(this, _onTusError, {
writable: true,
- value: (file, err) => {
- var _file$transloadit2, _err$message;
- _classPrivateFieldLooseBase(this, _closeAssemblyIfExists)[_closeAssemblyIfExists](
- file == null || (_file$transloadit2 = file.transloadit) == null ? void 0 : _file$transloadit2.assembly,
- );
+ value: (_, err) => {
+ var _err$message;
+ _classPrivateFieldLooseBase(this, _closeAssemblyIfExists)[_closeAssemblyIfExists]();
if (err != null && (_err$message = err.message) != null && _err$message.startsWith("tus: ")) {
var _originalRequest;
const endpoint = (_originalRequest = err.originalRequest) == null
@@ -412,8 +350,6 @@ export default class Transloadit extends BasePlugin {
errorReporting: this.opts.errorReporting,
rateLimitedQueue: _classPrivateFieldLooseBase(this, _rateLimitedQueue)[_rateLimitedQueue],
});
- this.activeAssemblies = {};
- this.assemblyWatchers = {};
this.completedFiles = Object.create(null);
}
install() {
@@ -439,8 +375,6 @@ export default class Transloadit extends BasePlugin {
this.uppy.on("restore:get-data", _classPrivateFieldLooseBase(this, _getPersistentData)[_getPersistentData]);
this.uppy.on("restored", _classPrivateFieldLooseBase(this, _onRestored)[_onRestored]);
this.setPluginState({
- assemblies: {},
- uploadsAssemblies: {},
files: {},
results: [],
});
@@ -474,16 +408,13 @@ export default class Transloadit extends BasePlugin {
},
});
}
- getAssembly(id) {
- const {
- assemblies,
- } = this.getPluginState();
- return assemblies[id];
+ getAssembly() {
+ return this.assembly.status;
}
getAssemblyFiles(assemblyID) {
return this.uppy.getFiles().filter(file => {
- var _file$transloadit3;
- return (file == null || (_file$transloadit3 = file.transloadit) == null ? void 0 : _file$transloadit3.assembly)
+ var _file$transloadit2;
+ return (file == null || (_file$transloadit2 = file.transloadit) == null ? void 0 : _file$transloadit2.assembly)
=== assemblyID;
});
}
@@ -563,38 +494,21 @@ function _createAssembly2(fileIDs, uploadID, assemblyOptions) {
...assemblyOptions,
expectedFiles: fileIDs.length,
}).then(async newAssembly => {
- const files = this.uppy.getFiles().filter(_ref2 => {
+ const files = this.uppy.getFiles().filter(_ref => {
let {
id,
- } = _ref2;
+ } = _ref;
return fileIDs.includes(id);
});
- if (files.length !== fileIDs.length) {
- if (files.length === 0) {
- await this.client.cancelAssembly(newAssembly);
- return null;
- }
- await this.client.updateNumberOfFilesInAssembly(newAssembly, files.length);
+ if (files.length === 0) {
+ await this.client.cancelAssembly(newAssembly);
+ return null;
}
const assembly = new Assembly(newAssembly, _classPrivateFieldLooseBase(this, _rateLimitedQueue)[_rateLimitedQueue]);
const {
status,
} = assembly;
const assemblyID = status.assembly_id;
- const {
- assemblies,
- uploadsAssemblies,
- } = this.getPluginState();
- this.setPluginState({
- assemblies: {
- ...assemblies,
- [assemblyID]: status,
- },
- uploadsAssemblies: {
- ...uploadsAssemblies,
- [uploadID]: [...uploadsAssemblies[uploadID], assemblyID],
- },
- });
const updatedFiles = {};
files.forEach(file => {
updatedFiles[file.id] = _classPrivateFieldLooseBase(this, _attachAssemblyMetadata)[_attachAssemblyMetadata](
@@ -608,19 +522,6 @@ function _createAssembly2(fileIDs, uploadID, assemblyOptions) {
...updatedFiles,
},
});
- const fileRemovedHandler = fileRemoved => {
- var _assembly$status;
- if (((_assembly$status = assembly.status) == null ? void 0 : _assembly$status.ok) === "ASSEMBLY_COMPLETED") {
- this.uppy.off("file-removed", fileRemovedHandler);
- return;
- }
- if (fileRemoved.id in updatedFiles) {
- delete updatedFiles[fileRemoved.id];
- const nbOfRemainingFiles = Object.keys(updatedFiles).length;
- this.client.updateNumberOfFilesInAssembly(newAssembly, nbOfRemainingFiles).catch(() => {});
- }
- };
- this.uppy.on("file-removed", fileRemovedHandler);
this.uppy.emit("transloadit:assembly-created", status, fileIDs);
this.uppy.log(`[Transloadit] Created Assembly ${assemblyID}`);
return assembly;
@@ -637,7 +538,7 @@ function _createAssembly2(fileIDs, uploadID, assemblyOptions) {
throw wrapped;
});
}
-function _createAssemblyWatcher2(idOrArrayOfIds, uploadID) {
+function _createAssemblyWatcher2(idOrArrayOfIds) {
const ids = Array.isArray(idOrArrayOfIds) ? idOrArrayOfIds : [idOrArrayOfIds];
const watcher = new AssemblyWatcher(this.uppy, ids);
watcher.on("assembly-complete", id => {
@@ -662,7 +563,7 @@ function _createAssemblyWatcher2(idOrArrayOfIds, uploadID) {
});
this.uppy.emit("error", error);
});
- this.assemblyWatchers[uploadID] = watcher;
+ this.watcher = watcher;
}
function _shouldWaitAfterUpload2() {
return this.opts.waitForEncoding || this.opts.waitForMetadata;
@@ -708,7 +609,7 @@ function _onFileUploadComplete2(assemblyId, uploadedFile) {
},
},
});
- this.uppy.emit("transloadit:upload", uploadedFile, this.getAssembly(assemblyId));
+ this.uppy.emit("transloadit:upload", uploadedFile, this.getAssembly());
}
function _onResult2(assemblyId, stepName, result) {
const state = this.getPluginState();
@@ -723,19 +624,12 @@ function _onResult2(assemblyId, stepName, result) {
this.setPluginState({
results: [...state.results, entry],
});
- this.uppy.emit("transloadit:result", stepName, result, this.getAssembly(assemblyId));
+ this.uppy.emit("transloadit:result", stepName, result, this.getAssembly());
}
function _onAssemblyFinished2(status) {
const url = status.assembly_ssl_url;
this.client.getAssemblyStatus(url).then(finalStatus => {
- const assemblyId = finalStatus.assembly_id;
- const state = this.getPluginState();
- this.setPluginState({
- assemblies: {
- ...state.assemblies,
- [assemblyId]: finalStatus,
- },
- });
+ this.assembly.status = finalStatus;
this.uppy.emit("transloadit:complete", finalStatus);
});
}
@@ -748,17 +642,9 @@ function _connectAssembly2(assembly) {
status,
} = assembly;
const id = status.assembly_id;
- this.activeAssemblies[id] = assembly;
+ this.assembly = assembly;
assembly.on("status", newStatus => {
- const {
- assemblies,
- } = this.getPluginState();
- this.setPluginState({
- assemblies: {
- ...assemblies,
- [id]: newStatus,
- },
- });
+ this.assembly.status = newStatus;
});
assembly.on("upload", file => {
_classPrivateFieldLooseBase(this, _onFileUploadComplete)[_onFileUploadComplete](id, file); |
* 4.x: @uppy/companion: switch from `node-redis` to `ioredis` (#4623) Fix headings in xhr.mdx
* 4.x: (38 commits) docs: assume tree-shaking bundler is the most common case (#5160) @uppy/core: remove `reason` (#5159) Release: [email protected] (#5194) Release: [email protected] (#5193) @uppy/companion: remove `chalk` from dependencies (#5178) @uppy/transloadit: do not cancel assembly when removing all files (#5191) @uppy/xhr-upload: fix regression for lowercase HTTP methods (#5179) meta: improve changelog generator (#5190) Release: [email protected] (#5189) examples: add SvelteKit example (#5181) @uppy/companion: fix missing `await` Release: [email protected] (#5188) @uppy/svelte: do not attempt removing plugin before it's created (#5186) Update facebook.mdx fixup! @uppy/tus: fix no headers passed to companion if argument is a function (#5182) @uppy/core: resolve some (breaking) TODOs (#4824) @uppy/tus: fix no headers passed to companion if argument is a function (#5182) @uppy/companion: fix google drive gsuite export large size (#5144) @uppy/companion: encode `uploadId` (#5168) @uppy/companion: bump `express-session` (#5177) ...
mifi
reviewed
May 29, 2024
| cy.wait(['@createAssemblies']).then(() => { | ||
| // eslint-disable-next-line | ||
| // @ts-ignore fix me | ||
| expect( |
There was a problem hiding this comment.
why was this removed? shouldn't we still verify that it polls the assembly and stops polling when assembly is cancelled?
| [id]: newStatus, | ||
| }, | ||
| }) | ||
| this.assembly.status = newStatus |
There was a problem hiding this comment.
is it a conscious decision not to store the assembly in pluginState any more? (I assume that means the UI cannot react to changes in the assembly anymore, I just want to make sure that's intended)
Comment on lines
+862
to
865
| if (assemblyID.length === 0) { | ||
| this.uppy.addResultData(uploadID, { transloadit: [] }) | ||
| return Promise.resolve() | ||
| } |
There was a problem hiding this comment.
why would assemblyID.length be 0? I think we should remove this check because an assembly will now always be created, right?
Suggested change
| if (assemblyID.length === 0) { | |
| this.uppy.addResultData(uploadID, { transloadit: [] }) | |
| return Promise.resolve() | |
| } |
| if (!assemblyID) return | ||
| this.activeAssemblies[assemblyID]?.close() | ||
| #closeAssemblyIfExists = () => { | ||
| this.assembly?.close() | ||
| } | ||
|
|
||
| #onError = (err: { name: string; message: string; details?: string }) => { |
There was a problem hiding this comment.
now that there is only one assembly, we could re-enable this todo code (see todo below)
Suggested change
| #onError = (err: { name: string; message: string; details?: string }) => { | |
| #onError = (err: { name: string; message: string; details?: string }) => { | |
| this.#closeAssemblyIfExists() |
| @@ -877,84 +792,39 @@ export default class Transloadit< | |||
| } | |||
|
|
|||
| #prepareUpload = async (fileIDs: string[], uploadID: string) => { | |||
There was a problem hiding this comment.
uploadID is unused now
Suggested change
| #prepareUpload = async (fileIDs: string[], uploadID: string) => { | |
| #prepareUpload = async (fileIDs: string[]) => { |
| try { | ||
| const assembly = (await this.#createAssembly( | ||
| fileIDs, | ||
| uploadID, |
There was a problem hiding this comment.
uploadID is no longer in use and should be removed from the #createAseembly signature too
Suggested change
| uploadID, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #4765
Tip
Click "Remove whitespace" and review by commit with the commits dropdown.
I tried to do atomic commits so you can review per commit to see the changes more in isolation. Tried to find a balance between removing enough complexity but going too far that there's a high risk of breaking things. More simplifications can be made, but these are the ones focussed on managing a single assembly instead of multiple.
I think it would be good if at least one other person tries to break this locally with pause/cancel/resume/local/remote states.