From 238c8fb250b13ee89687a9a3d5d464314a5601e4 Mon Sep 17 00:00:00 2001 From: sawka Date: Fri, 1 Sep 2023 20:15:48 -0700 Subject: [PATCH] fix return type of writeRemoteFile, small formatting/fixes --- src/model.ts | 14 ++++++++++++-- src/simplerenderer.tsx | 10 ++++------ src/types.ts | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/model.ts b/src/model.ts index 3fe21ae2..666d192d 100644 --- a/src/model.ts +++ b/src/model.ts @@ -3655,7 +3655,13 @@ class Model { return prtn; } - writeRemoteFile(screenId: string, lineId: string, path: string, data: Uint8Array, opts?: { useTemp?: boolean }) { + writeRemoteFile( + screenId: string, + lineId: string, + path: string, + data: Uint8Array, + opts?: { useTemp?: boolean } + ): Promise { opts = opts || {}; let params = { screenid: screenId, @@ -3670,7 +3676,11 @@ class Model { let url = new URL(GlobalModel.getBaseHostPort() + "/api/write-file"); let fetchHeaders = this.getFetchHeaders(); let prtn = fetch(url, { method: "post", headers: fetchHeaders, body: formData }); - return prtn; + return prtn + .then((resp) => handleJsonFetchResponse(url, resp)) + .then((data) => { + return; + }); } } diff --git a/src/simplerenderer.tsx b/src/simplerenderer.tsx index 5c65c30e..8e64e796 100644 --- a/src/simplerenderer.tsx +++ b/src/simplerenderer.tsx @@ -23,6 +23,7 @@ import type { import { PacketDataBuffer } from "./ptydata"; import { debounce, throttle } from "throttle-debounce"; import * as util from "./util"; +import { GlobalModel } from "./model"; type OV = mobx.IObservableValue; type CV = mobx.IComputedValue; @@ -94,8 +95,7 @@ class SimpleBlobRendererModel { })(); if (delayMs == 0) { this.reload_noDelay(); - } - else { + } else { setTimeout(() => { reload_noDelay(); }, delayMs); @@ -106,11 +106,9 @@ class SimpleBlobRendererModel { let source = this.lineState["prompt:source"] || "pty"; if (source == "pty") { this.reloadPtyData(); - } - else if (source == "file") { + } else if (source == "file") { this.reloadFileData(); - } - else { + } else { mobx.action(() => { this.loadError.set("error: invalid load source: " + source); })(); diff --git a/src/types.ts b/src/types.ts index 9be79d94..74ac69cb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -393,7 +393,7 @@ type RendererModelInitializeParams = { rawCmd: WebCmd; savedHeight: number; opts: RendererOpts; - lineState: LineStateType, + lineState: LineStateType; api: RendererModelContainerApi; ptyDataSource: (termContext: TermContextUnion) => Promise; }; @@ -410,7 +410,7 @@ type RendererModel = { }; type SimpleBlobRendererComponent = React.ComponentType<{ - path: String; + path: string; data: Blob; context: RendererContext; opts: RendererOpts;