Commit 3f5eddb

author

Akos Kitta

committed

fix: encoding when reading a cloud sketch

Closes #449 Closes #634 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

1 parent 01ee045 commit 3f5eddbCopy full SHA for 3f5eddb

File tree

3 files changed

+16

-46

lines changed

arduino-ide-extension/src
- browser/create
  - create-api.ts
  - create-fs-provider.ts
- common
  - utils.ts

3 files changed

+16

-46

lines changed

`‎arduino-ide-extension/src/browser/create/create-api.ts‎`

Lines changed: 3 additions & 45 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import { MaybePromise } from '@theia/core/lib/common/types';`
`2`	`2`	`import { inject, injectable } from '@theia/core/shared/inversify';`
`3`	`3`	`import { fetch } from 'cross-fetch';`
`4`	`4`	`import { SketchesService } from '../../common/protocol';`
	`5`	`+import { unit8ArrayToString } from '../../common/utils';`
`5`	`6`	`import { ArduinoPreferences } from '../arduino-preferences';`
`6`	`7`	`import { AuthenticationClientService } from '../auth/authentication-client-service';`
`7`	`8`	`import { SketchCache } from '../widgets/cloud-sketchbook/cloud-sketch-cache';`
`@@ -19,49 +20,6 @@ export namespace ResponseResultProvider {`
`19`	`20`	`export const JSON: ResponseResultProvider = (response) => response.json();`
`20`	`21`	`}`
`21`	`22`
`22`		`-// TODO: check if this is still needed: https://github.com/electron/electron/issues/18733`
`23`		`-// The original issue was reported for Electron 5.x and 6.x. Theia uses 15.x`
`24`		`-export function Utf8ArrayToStr(array: Uint8Array): string {`
`25`		`- let out, i, c;`
`26`		`- let char2, char3;`
`27`		`-`
`28`		`- out = '';`
`29`		`- const len = array.length;`
`30`		`- i = 0;`
`31`		`- while (i < len) {`
`32`		`- c = array[i++];`
`33`		`- switch (c >> 4) {`
`34`		`- case 0:`
`35`		`- case 1:`
`36`		`- case 2:`
`37`		`- case 3:`
`38`		`- case 4:`
`39`		`- case 5:`
`40`		`- case 6:`
`41`		`- case 7:`
`42`		`- // 0xxxxxxx`
`43`		`- out += String.fromCharCode(c);`
`44`		`- break;`
`45`		`- case 12:`
`46`		`- case 13:`
`47`		`- // 110x xxxx 10xx xxxx`
`48`		`- char2 = array[i++];`
`49`		`- out += String.fromCharCode(((c & 0x1f) << 6) \| (char2 & 0x3f));`
`50`		`- break;`
`51`		`- case 14:`
`52`		`- // 1110 xxxx 10xx xxxx 10xx xxxx`
`53`		`- char2 = array[i++];`
`54`		`- char3 = array[i++];`
`55`		`- out += String.fromCharCode(`
`56`		`- ((c & 0x0f) << 12) \| ((char2 & 0x3f) << 6) \| ((char3 & 0x3f) << 0)`
`57`		`- );`
`58`		`- break;`
`59`		`- }`
`60`		`- }`
`61`		`-`
`62`		`- return out;`
`63`		`-}`
`64`		`-`
`65`	`23`	`type ResourceType = 'f' \| 'd';`
`66`	`24`
`67`	`25`	`@injectable()`
`@@ -333,7 +291,7 @@ export class CreateApi {`
`333`	`291`
`334`	`292`	`// parse the secret file`
`335`	`293`	`const secrets = (`
`336`		`- typeof content === 'string' ? content : Utf8ArrayToStr(content)`
	`294`	`+ typeof content === 'string' ? content : unit8ArrayToString(content)`
`337`	`295`	`)`
`338`	`296`	`.split(/\r?\n/)`
`339`	`297`	`.reduce((prev, curr) => {`
`@@ -397,7 +355,7 @@ export class CreateApi {`
`397`	`355`	`const headers = await this.headers();`
`398`	`356`
`399`	`357`	`let data: string =`
`400`		`- typeof content === 'string' ? content : Utf8ArrayToStr(content);`
	`358`	`+ typeof content === 'string' ? content : unit8ArrayToString(content);`
`401`	`359`	`data = await this.toggleSecretsInclude(posixPath, data, 'remove');`
`402`	`360`
`403`	`361`	`const payload = { data: btoa(data) };`

`‎arduino-ide-extension/src/browser/create/create-fs-provider.ts‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import { CreateUri } from './create-uri';`
`29`	`29`	`import { SketchesService } from '../../common/protocol';`
`30`	`30`	`import { ArduinoPreferences } from '../arduino-preferences';`
`31`	`31`	`import { Create } from './typings';`
	`32`	`+import { stringToUint8Array } from '../../common/utils';`
`32`	`33`
`33`	`34`	`@injectable()`
`34`	`35`	`export class CreateFsProvider`
`@@ -154,7 +155,7 @@ export class CreateFsProvider`
`154`	`155`
`155`	`156`	`async readFile(uri: URI): Promise<Uint8Array> {`
`156`	`157`	`const content = await this.getCreateApi.readFile(uri.path.toString());`
`157`		`- return newTextEncoder().encode(content);`
	`158`	`+ return stringToUint8Array(content);`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`async writeFile(`

`‎arduino-ide-extension/src/common/utils.ts‎`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,14 @@ export function startsWithUpperCase(what: string): boolean {`
`20`	`20`	`export function isNullOrUndefined(what: unknown): what is undefined \| null {`
`21`	`21`	`return what === undefined \|\| what === null;`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+// Text encoder can crash in electron browser: https://github.com/arduino/arduino-ide/issues/634#issuecomment-1440039171`
	`25`	`+export function unit8ArrayToString(uint8Array: Uint8Array): string {`
	`26`	`+ return uint8Array.reduce(`
	`27`	`+ (text, byte) => text + String.fromCharCode(byte),`
	`28`	`+ ''`
	`29`	`+ );`
	`30`	`+}`
	`31`	`+export function stringToUint8Array(text: string): Uint8Array {`
	`32`	`+ return Uint8Array.from(text, (char) => char.charCodeAt(0));`
	`33`	`+}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 3f5eddb

File tree

3 files changed

3 files changed

`‎arduino-ide-extension/src/browser/create/create-api.ts‎`

`‎arduino-ide-extension/src/browser/create/create-fs-provider.ts‎`

`‎arduino-ide-extension/src/common/utils.ts‎`

0 commit comments