Skip to content

Commit c11726a

Browse files
kcq888kcq888
authored
Merge pull request #94 from Open-STEM/kq-bugs
Fixed build errors to due update package.json fix. Also, fixed plugin…
2 parents 124852a + 7b0ed1e commit c11726a

File tree

7 files changed

+62
-32
lines changed

7 files changed

+62
-32
lines changed

‎src/components/dialogs/settings.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ function SettingsDlg({ isXrpConnected, toggleDialog }: SettingsProps) {
122122
});
123123
}
124124
} catch (error) {
125-
modeLogger.error('Error fetching admin data:', error);
125+
if (error instanceof Error) {
126+
// Pass the Error object's stack or message
127+
modeLogger.error(`Error fetching admin data: ${error.stack ?? error.message}`);
128+
}
126129
}
127130
} else {
128131
setModeValue(ModeType.GOOUSER);

‎src/components/folder-tree.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ function FolderTree(treeProps: TreeProps) {
103103
appMgrRef.current?.setFoderData(filesysData);
104104
}
105105
} catch (err) {
106+
if (err instanceof Error) {
107+
folderLogger.error(`Failed to parse filesys data: ${err.stack ?? err.message}`);
108+
}
106109
setTreeData(undefined);
107-
folderLogger.error('Failed to parse filesys data', err);
108110
}
109111
});
110112

@@ -323,7 +325,7 @@ function FolderTree(treeProps: TreeProps) {
323325
index: number;
324326
type: 'internal' | 'leaf';
325327
}) => {
326-
folderLogger.debug('Create node:', { parentId, parentNode, index, type });
328+
folderLogger.debug(`Create node: ${parentId}, ${parentNode}, ${index}, ${type}`);
327329
// Generate a unique ID for the new node
328330
const newId = uniqueId(parentNode?.data.name || `node`);
329331

‎src/connections/bluetoothconnection.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,9 @@ export class BluetoothConnection extends Connection {
381381
//return true;
382382
// Perform operations after successful connection
383383
} catch (error) {
384-
this.connLogger.debug('timed out: ', error);
384+
if (error instanceof Error) {
385+
this.connLogger.debug(`timed out: ${error.stack ?? error.message}`);
386+
}
385387
this.bleDevice = undefined;
386388
this.onDisconnected();
387389
//throw new Error('Failed BLE reconnect' + error); TODO: I don't think we want to throw an error here
@@ -410,7 +412,7 @@ export class BluetoothConnection extends Connection {
410412
await this.bleQueue(this.str2ab(str));
411413
} else {
412414
//this.connLogger.debug("writing: " + this.TEXT_DECODER.decode(str));
413-
await this.bleQueue(str);
415+
await this.bleQueue(str as BufferSource);
414416
}
415417
} catch (error) {
416418
this.connLogger.debug(error);
@@ -426,7 +428,7 @@ export class BluetoothConnection extends Connection {
426428

427429
try {
428430
//this.connLogger.debug("writing: " + this.TEXT_DECODER.decode(str));
429-
await this.bleDataWriter?.writeValue(data);
431+
await this.bleDataWriter?.writeValue(data as BufferSource);
430432

431433
} catch (error) {
432434
this.connLogger.debug(error);

‎src/managers/pluginmgr.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,13 @@ export default class PluginMgr {
213213
scriptUrl = '/public' + scriptUrl;
214214
}
215215

216-
217216
if (this.loadedScripts.has(scriptUrl)) {
218217
return; // Already loaded
219218
}
220219

221220
try {
222221
// Dynamic import of the plugin script
223-
let url;
224-
if (process.env.NODE_ENV === 'development') {
225-
url = '/public' + scriptUrl;
226-
} else {
227-
url = scriptUrl;
228-
}
222+
const url = scriptUrl;
229223
await import(/* @vite-ignore */ url);
230224
this.loadedScripts.add(scriptUrl);
231225
} catch (error) {

‎src/services/google-auth.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class GoogleAuthService {
120120
if (this._refreshToken) {
121121
this.getAccessToken().then((token) => {
122122
this._accessToken = token;
123-
this._modeLogger.debug('Access Token refreshed: ', this._accessToken);
123+
this._modeLogger.debug(`Access Token refreshed: , ${this._accessToken}`);
124124
}).catch((error) => {
125125
this._modeLogger.error('Error refreshing access token:', error);
126126
});
@@ -180,7 +180,9 @@ class GoogleAuthService {
180180
});
181181
}
182182
catch (error) {
183-
this._modeLogger.error('Error fetching access token:', error);
183+
if (error instanceof Error) {
184+
this._modeLogger.error(`Error fetching access token: ${error.stack ?? error.message}`);
185+
}
184186
throw error;
185187
}
186188
};
@@ -220,7 +222,9 @@ class GoogleAuthService {
220222
});
221223
}
222224
catch (error) {
223-
this._modeLogger.error('Error refreshing access token:', error);
225+
if (error instanceof Error) {
226+
this._modeLogger.error(`Error fetching refresh token: ${error.stack ?? error.message}`);
227+
}
224228
throw error;
225229
}
226230
}

‎src/services/google-drive.ts‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,13 @@ class GoogleDriveService {
9090

9191
const folderMetadata: GoogleDriveFile = await response.json();
9292
this._modeLogger.debug(`Folder '${folderName}' created successfully!`);
93-
this._modeLogger.debug('Created Folder Metadata:', folderMetadata);
93+
this._modeLogger.debug(`Created Folder Metadata: ${folderMetadata}`);
9494

9595
return folderMetadata;
9696
} catch (error) {
97-
this._modeLogger.error('Error creating Google Drive folder:', error);
97+
if (error instanceof Error) {
98+
this._modeLogger.error(`Error creating Google Drive folder: ${error.stack ?? error.message}`);
99+
}
98100
return null;
99101
}
100102
}
@@ -121,7 +123,9 @@ class GoogleDriveService {
121123
return undefined;
122124
}
123125
} catch (error) {
124-
this._modeLogger.error('Error finding folder:', error);
126+
if (error instanceof Error) {
127+
this._modeLogger.error(`Error finding folder: ${error.stack ?? error.message}`);
128+
}
125129
return undefined;
126130
}
127131

@@ -319,7 +323,9 @@ class GoogleDriveService {
319323
const blob = await contentResponse.blob();
320324
return { blob, fileName, mimeType: metadata.mimeType };
321325
} catch (error) {
322-
this._modeLogger.error('Error downloading Google Drive file:', error);
326+
if (error instanceof Error) {
327+
this._modeLogger.error(`Error downloading Google Drive file: ${error.stack ?? error.message}`);
328+
}
323329
return null;
324330
}
325331
}
@@ -354,7 +360,9 @@ class GoogleDriveService {
354360

355361
return fileContent;
356362
} catch (error) {
357-
this._modeLogger.error('Error in getPythonFileContentInMemory:', error);
363+
if (error instanceof Error) {
364+
this._modeLogger.error(`Error in getPythonFileContentInMemory: ${error.stack ?? error.message}`);
365+
}
358366
return null;
359367
}
360368
}
@@ -404,7 +412,9 @@ class GoogleDriveService {
404412
}
405413
return null; // No folder found
406414
} catch (error) {
407-
this._modeLogger.error('Error finding folder:', error);
415+
if (error instanceof Error) {
416+
this._modeLogger.error(`Error finding folder: ${error.stack ?? error.message}`);
417+
}
408418
throw error; // Re-throw the error for further handling
409419
}
410420
}
@@ -477,7 +487,9 @@ class GoogleDriveService {
477487

478488
return uploadedFileMetadata;
479489
} catch (error) {
480-
this._modeLogger.error('Error uploading blob to Google Drive:', error);
490+
if (error instanceof Error) {
491+
this._modeLogger.error(`Error uploading file to Google Drive: ${error.stack ?? error.message}`);
492+
}
481493
return null;
482494
}
483495
}
@@ -557,14 +569,15 @@ class GoogleDriveService {
557569
this._modeLogger.debug(
558570
`File '${fileName}' ${method === 'POST' ? 'created' : 'updated'} successfully.`,
559571
);
560-
this._modeLogger.debug('File Metadata:', fileMetadata);
572+
this._modeLogger.debug(`File Metadata: ${fileMetadata}`);
561573

562574
return fileMetadata;
563575
} catch (error) {
564-
this._modeLogger.error(
565-
`Error ${method === 'POST' ? 'creating' : 'updating'} file:`,
566-
error,
567-
);
576+
if (error instanceof Error) {
577+
this._modeLogger.error(
578+
`Error ${method === 'POST' ? 'creating' : 'updating'} file: ${error.stack ?? error.message}`,
579+
);
580+
}
568581
return null;
569582
}
570583
}
@@ -598,7 +611,9 @@ class GoogleDriveService {
598611
const renamedFile = await response.json();
599612
this._modeLogger.debug(`File renamed successfully to: ${renamedFile.name}`);
600613
} catch (error) {
601-
this._modeLogger.error('Failed to rename file:', error);
614+
if (error instanceof Error) {
615+
this._modeLogger.error(`Error renaming file: ${error.stack ?? error.message}`);
616+
}
602617
}
603618
}
604619

@@ -625,7 +640,9 @@ class GoogleDriveService {
625640
}
626641

627642
} catch (error) {
628-
this._modeLogger.error('Failed to delete file', error);
643+
if (error instanceof Error) {
644+
this._modeLogger.error(`Error deleting file: ${error.message}`);
645+
}
629646
}
630647

631648
}

‎src/widgets/login.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ function Login({ logoutCallback, onSuccess }: LoginProps) {
6868
await driveService.createFolder(XRPCODES);
6969
}
7070
} catch (error) {
71-
loginLogger.error('Error checking or creating XRPCodes folder:', error);
71+
if (error instanceof Error) {
72+
loginLogger.error(`Error checking or creating XRPCodes folder: ${error.stack ?? error.message}`);
73+
} else {
74+
loginLogger.error(`Error checking or creating XRPCodes folder: ${String(error)}`);
75+
}
7276
}
7377
});
7478

@@ -88,7 +92,11 @@ function Login({ logoutCallback, onSuccess }: LoginProps) {
8892
}
8993
},
9094
onError: (error) => {
91-
loginLogger.error('Login Failed:', error);
95+
if (error instanceof Error) {
96+
loginLogger.error(`Login Failed:' ${error.stack ?? error.message}`);
97+
} else {
98+
loginLogger.error(`Login Failed: ${String(error)}`);
99+
}
92100
},
93101
});
94102

0 commit comments

Comments
 (0)