TagSpaces is an offline, open source, document manager with tagging support
handling WS errors (#1555)
Stanimir360ba7e8bc63
diff --git a/app/package-template.json b/app/package-template.jsonindex 93bc025e8..4ab7f2a2d 100644--- a/app/package-template.json+++ b/app/package-template.json@@ -3,8 +3,8 @@"@tagspaces/extensions": "1.0.10"},"nodeDependencies": {+ "@tagspaces/tagspaces-ws": "1.0.30","@tagspaces/extensions": "1.0.11",- "@tagspaces/tagspaces-ws": "1.0.29","sharp": "^0.29.3"}}diff --git a/app/package.json b/app/package.jsonindex 0c5aa8dc4..1532f3ae6 100644--- a/app/package.json+++ b/app/package.json@@ -13,8 +13,8 @@"license": "AGPL-3.0","scripts": {},"dependencies": {+ "@tagspaces/tagspaces-ws": "1.0.30","@tagspaces/extensions": "1.0.11",- "@tagspaces/tagspaces-ws": "1.0.29","sharp": "^0.29.3"}}diff --git a/app/services/electron-io.ts b/app/services/electron-io.tsindex ed5a1de0e..05c834e58 100644--- a/app/services/electron-io.ts+++ b/app/services/electron-io.ts@@ -228,19 +228,32 @@ export default class ElectronIO {};const reqPost = http.request(option, resp => {- // .get('http://127.0.0.1:8888/thumb-gen?' + search.toString(), resp => {- let data = '';+ if (resp.statusCode >= 400) {+ const chunks = [];+ resp+ .on('data', c => chunks.push(c))+ .on('end', () => {+ const err = new Error(+ 'error http code:' + resp.statusCode + ' ' + endpoint+ );+ console.log(Buffer.concat(chunks).toString(), err);+ reject(err);+ });+ } else {+ // .get('http://127.0.0.1:8888/thumb-gen?' + search.toString(), resp => {+ let data = '';- // A chunk of data has been received.- resp.on('data', chunk => {- data += chunk;- });+ // A chunk of data has been received.+ resp.on('data', chunk => {+ data += chunk;+ });- // The whole response has been received. Print out the result.- resp.on('end', () => {- // console.log(JSON.parse(data).explanation);- resolve(JSON.parse(data));- });+ // The whole response has been received. Print out the result.+ resp.on('end', () => {+ // console.log(JSON.parse(data).explanation);+ resolve(JSON.parse(data));+ });+ }}).on('error', err => {console.log('Error: ' + err.message);diff --git a/app/services/utils-io.ts b/app/services/utils-io.tsindex 77916bed4..fb2c7e0a6 100644--- a/app/services/utils-io.ts+++ b/app/services/utils-io.ts@@ -43,7 +43,6 @@ import {} from '-/utils/paths';import i18n from '../services/i18n';import versionMeta from '../version.json';-// import { getThumbnailURLPromise } from '-/services/thumbsgenerator';import { OpenedEntry, actions as AppActions } from '-/reducers/app';import { getLocation } from '-/reducers/locations';import { TS } from '-/tagspaces.namespace';@@ -309,7 +308,14 @@ export function prepareDirectoryContent(if (tmbGenerationList.length > 0) {PlatformIO.createThumbnailsInWorker(tmbGenerationList).then(handleTmbGenerationResults)- .catch(handleTmbGenerationFailed);+ .catch(() => {+ // WS error handle+ Promise.all(+ tmbGenerationList.map(tmbPath => getThumbnailURLPromise(tmbPath))+ )+ .then(handleTmbGenerationResults)+ .catch(handleTmbGenerationFailed);+ });}if (tmbGenerationPromises.length > 0) {Promise.all(tmbGenerationPromises)