@synopackageland/templates 0.15.1 → 0.16.0

package/templates/native-go/backend/internal/app/shared_folder_test.go

@@ -1,10 +1,13 @@
 package app
 
 import (
+	"context"
 	"errors"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/synopackageland/syno-pkg-land-sdk/sharedfolder"
 )
 
 func writeConfig(t *testing.T, dir, body string) {
@@ -14,145 +17,129 @@ func writeConfig(t *testing.T, dir, body string) {
 	}
 }
 
-func TestReadSharedFoldersWithoutConfigIsEmpty(t *testing.T) {
-	got, err := ReadSharedFolders(t.TempDir())
-	if err != nil || len(got) != 0 {
-		t.Fatalf("got %v %v", got, err)
+// sharedFixture has /volume1/Photos with the mode, chosen for key "media".
+func sharedFixture(t *testing.T, mode os.FileMode) Config {
+	t.Helper()
+	cfg := testConfig(t)
+	cfg.VolumeRoot = t.TempDir()
+	dir := filepath.Join(cfg.VolumeRoot, "volume1", "Photos")
+	if err := os.MkdirAll(dir, 0o755); err != nil {
+		t.Fatal(err)
 	}
+	if err := os.Chmod(dir, mode); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { os.Chmod(dir, 0o755) })
+	writeConfig(t, cfg.DataDir, `{"schema":1,"shared_folders":{"media":"Photos"}}`)
+	cfg.SharedFolderRequired = map[string]sharedfolder.Access{"media": sharedfolder.Write}
+	return cfg
 }
 
-func TestReadSharedFoldersReturnsNamesByKey(t *testing.T) {
-	dir := t.TempDir()
-	writeConfig(t, dir, `{"schema":1,"shared_folders":{"media":"Family Photos"}}`)
-	got, err := ReadSharedFolders(dir)
-	if err != nil || got["media"] != "Family Photos" || len(got) != 1 {
-		t.Fatalf("got %v %v", got, err)
+func skipRoot(t *testing.T) {
+	t.Helper()
+	if os.Geteuid() == 0 {
+		t.Skip("root ignores directory modes")
 	}
 }
 
-func TestReadSharedFoldersRefusesUnknownSchemaAndBadNames(t *testing.T) {
-	for _, body := range []string{
-		`{"schema":2,"shared_folders":{"media":"x"}}`,
-		`{"schema":1,"shared_folders":{"media":"a/b"}}`,
-		`{"schema":1,"shared_folders":{"media":".."}}`,
-		`{"schema":1,"shared_folders":{"media":"@appdata"}}`,
-		`{"schema":1,"shared_folders":{"media":""}}`,
-		`not json`,
-	} {
-		dir := t.TempDir()
-		writeConfig(t, dir, body)
-		if _, err := ReadSharedFolders(dir); err == nil {
-			t.Errorf("%s: want an error", body)
-		}
+func TestSharedFolderStatusIsEmptyWithoutAFolder(t *testing.T) {
+	code, out := call(t, testConfig(t), alice, "sharedfolder.status", `{}`)
+	if code != "" || len(out["data"].(map[string]any)["folders"].([]any)) != 0 {
+		t.Fatalf("%q %v", code, out)
 	}
 }
 
-func TestResolveSharedFolderFindsTheNameOnItsVolume(t *testing.T) {
-	root := t.TempDir()
-	for _, d := range []string{"volume1/other", "volume2/Photos", "volume2/@appdata"} {
-		if err := os.MkdirAll(filepath.Join(root, d), 0o755); err != nil {
-			t.Fatal(err)
+func TestSharedFolderStatusReportsGrantedAndPending(t *testing.T) {
+	skipRoot(t)
+	for _, c := range []struct {
+		mode  os.FileMode
+		state string
+	}{{0o755, "ready"}, {0o555, "pending"}} {
+		cfg := sharedFixture(t, c.mode)
+		code, out := call(t, cfg, alice, "sharedfolder.status", `{}`)
+		if code != "" {
+			t.Fatalf("%q %v", code, out)
+		}
+		row := out["data"].(map[string]any)["folders"].([]any)[0].(map[string]any)
+		if row["state"] != c.state || row["required"] != "write" || row["name"] != "Photos" || row["path"] != filepath.Join(cfg.VolumeRoot, "volume1", "Photos") {
+			t.Fatalf("mode %o: %v", c.mode, row)
 		}
-	}
-	got, err := ResolveSharedFolder(root, "Photos")
-	if err != nil || got != filepath.Join(root, "volume2", "Photos") {
-		t.Fatalf("got %q %v", got, err)
 	}
 }
 
-func TestResolveSharedFolderFollowsAMovedShare(t *testing.T) {
-	root := t.TempDir()
-	os.MkdirAll(filepath.Join(root, "volume1", "Photos"), 0o755)
-	first, _ := ResolveSharedFolder(root, "Photos")
-	os.Rename(filepath.Join(root, "volume1", "Photos"), filepath.Join(root, "Photos.tmp"))
-	os.MkdirAll(filepath.Join(root, "volume2"), 0o755)
-	os.Rename(filepath.Join(root, "Photos.tmp"), filepath.Join(root, "volume2", "Photos"))
-	second, err := ResolveSharedFolder(root, "Photos")
-	if err != nil || first == second || second != filepath.Join(root, "volume2", "Photos") {
-		t.Fatalf("%q -> %q %v", first, second, err)
+func TestSharedFolderStatusIsAdministratorOnlyByDefault(t *testing.T) {
+	cfg := sharedFixture(t, 0o755)
+	if code, _ := call(t, cfg, bob, "sharedfolder.status", `{}`); code == "" {
+		t.Fatal("a non-administrator read the status")
 	}
 }
 
-func TestResolveSharedFolderErrors(t *testing.T) {
-	root := t.TempDir()
-	if _, err := ResolveSharedFolder(root, "Missing"); !errors.Is(err, ErrSharedFolderNotFound) {
-		t.Fatalf("missing: %v", err)
-	}
-	os.MkdirAll(filepath.Join(root, "volume1", "Dup"), 0o755)
-	os.MkdirAll(filepath.Join(root, "volume2", "Dup"), 0o755)
-	if _, err := ResolveSharedFolder(root, "Dup"); !errors.Is(err, ErrSharedFolderAmbiguous) {
-		t.Fatalf("ambiguous: %v", err)
-	}
-	for _, bad := range []string{"", "..", "a/b", "@appdata", ".x"} {
-		if _, err := ResolveSharedFolder(root, bad); err == nil {
-			t.Errorf("%q: want an error", bad)
-		}
+func TestAppStatusNoLongerCarriesSharedFolders(t *testing.T) {
+	cfg := sharedFixture(t, 0o755)
+	_, out := call(t, cfg, alice, "app.status", `{}`)
+	data := out["data"].(map[string]any)
+	if _, present := data["shared_folders"]; present {
+		t.Fatalf("app.status: %v", data)
 	}
 }
 
-func TestResolveSharedFolderIgnoresAFileOfThatName(t *testing.T) {
-	root := t.TempDir()
-	os.MkdirAll(filepath.Join(root, "volume1"), 0o755)
-	os.WriteFile(filepath.Join(root, "volume1", "Notes"), nil, 0o644)
-	if _, err := ResolveSharedFolder(root, "Notes"); !errors.Is(err, ErrSharedFolderNotFound) {
-		t.Fatalf("got %v", err)
+func TestSharedFolderStatusFailsOnACorruptConfig(t *testing.T) {
+	cfg := testConfig(t)
+	writeConfig(t, cfg.DataDir, `not json`)
+	if code, _ := call(t, cfg, alice, "sharedfolder.status", `{}`); code != "internal" {
+		t.Fatalf("code %q", code)
 	}
 }
 
-func TestStatusOmitsSharedFoldersWhenNoneConfigured(t *testing.T) {
-	_, out := call(t, testConfig(t), alice, "app.status", `{}`)
-	if _, present := out["data"].(map[string]any)["shared_folders"]; present {
-		t.Fatalf("unexpected shared_folders: %v", out)
+func TestStorageAdapterFollowsTheChosenFolderAndAMovedShare(t *testing.T) {
+	skipRoot(t)
+	cfg := sharedFixture(t, 0o755)
+	var applied []string
+	cfg.StorageAdapter = func(_ context.Context, key, path string) error {
+		applied = append(applied, key+"="+path)
+		return nil
+	}
+	first := filepath.Join(cfg.VolumeRoot, "volume1", "Photos")
+	for i := 0; i < 2; i++ {
+		if code, _ := call(t, cfg, alice, "sharedfolder.status", `{}`); code != "" {
+			t.Fatal(code)
+		}
 	}
-}
-
-func TestStatusReportsEachConfiguredSharedFolder(t *testing.T) {
-	cfg := testConfig(t)
-	cfg.VolumeRoot = t.TempDir()
-	os.MkdirAll(filepath.Join(cfg.VolumeRoot, "volume1", "Photos"), 0o755)
-	writeConfig(t, cfg.DataDir, `{"schema":1,"shared_folders":{"media":"Photos","gone":"Missing"}}`)
-	_, out := call(t, cfg, alice, "app.status", `{}`)
-	rows := out["data"].(map[string]any)["shared_folders"].([]any)
-	if len(rows) != 2 {
-		t.Fatalf("rows: %v", rows)
+	if len(applied) != 1 || applied[0] != "media="+first {
+		t.Fatalf("first reads apply once: %v", applied)
 	}
-	byKey := map[string]map[string]any{}
-	for _, r := range rows {
-		m := r.(map[string]any)
-		byKey[m["key"].(string)] = m
+	second := filepath.Join(cfg.VolumeRoot, "volume2", "Photos")
+	if err := os.MkdirAll(filepath.Dir(second), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Rename(first, second); err != nil {
+		t.Fatal(err)
 	}
-	media, gone := byKey["media"], byKey["gone"]
-	if media["name"] != "Photos" || media["exists"] != true || media["readable"] != true || media["writable"] != true || media["path"] != filepath.Join(cfg.VolumeRoot, "volume1", "Photos") {
-		t.Fatalf("media: %v", media)
+	if code, _ := call(t, cfg, alice, "sharedfolder.status", `{}`); code != "" {
+		t.Fatal(code)
 	}
-	if gone["exists"] != false || gone["readable"] != false || gone["writable"] != false || gone["error"] == nil || gone["path"] != nil {
-		t.Fatalf("gone: %v", gone)
+	if len(applied) != 2 || applied[1] != "media="+second {
+		t.Fatalf("a moved share applies the new path: %v", applied)
 	}
 }
 
-func TestStatusReportsAFolderThePackageAccountCannotWrite(t *testing.T) {
-	if os.Geteuid() == 0 {
-		t.Skip("root ignores directory modes")
-	}
-	cfg := testConfig(t)
-	cfg.VolumeRoot = t.TempDir()
-	dir := filepath.Join(cfg.VolumeRoot, "volume1", "Locked")
-	os.MkdirAll(dir, 0o755)
-	os.Chmod(dir, 0o555)
-	t.Cleanup(func() { os.Chmod(dir, 0o755) })
-	writeConfig(t, cfg.DataDir, `{"schema":1,"shared_folders":{"media":"Locked"}}`)
-	_, out := call(t, cfg, alice, "app.status", `{}`)
-	row := out["data"].(map[string]any)["shared_folders"].([]any)[0].(map[string]any)
-	if row["exists"] != true || row["readable"] != true || row["writable"] != false {
-		t.Fatalf("row: %v", row)
+func TestStorageAdapterWaitsForThePermission(t *testing.T) {
+	skipRoot(t)
+	cfg := sharedFixture(t, 0o555)
+	called := false
+	cfg.StorageAdapter = func(context.Context, string, string) error { called = true; return nil }
+	if code, _ := call(t, cfg, alice, "sharedfolder.status", `{}`); code != "" || called {
+		t.Fatalf("pending folder: code %q called %v", code, called)
 	}
 }
 
-func TestStatusReportsACorruptConfigWithoutFailing(t *testing.T) {
-	cfg := testConfig(t)
-	writeConfig(t, cfg.DataDir, `not json`)
-	code, out := call(t, cfg, alice, "app.status", `{}`)
-	if code != "" || out["data"].(map[string]any)["shared_folders_error"] == nil {
-		t.Fatalf("%q %v", code, out)
+func TestSharedFolderPathNamesWhatToGrant(t *testing.T) {
+	skipRoot(t)
+	_, err := sharedFixture(t, 0o555).SharedFolderPath("media")
+	if !errors.Is(err, sharedfolder.ErrPermissionPending) {
+		t.Fatalf("got %v", err)
+	}
+	if path, err := sharedFixture(t, 0o755).SharedFolderPath("media"); err != nil || path == "" {
+		t.Fatalf("%q %v", path, err)
 	}
 }

package/templates/native-go/i18n/messages/de.json

@@ -8,7 +8,7 @@
   "error.bad_request": "Überprüfen Sie den eingegebenen Wert und versuchen Sie es erneut.",
   "error.bad_response": "Dieser Vorgang kann nicht ausgeführt werden. Bitte versuchen Sie es später erneut.",
   "error.cross_origin": "Dieser Vorgang kann nicht ausgeführt werden. Bitte versuchen Sie es später erneut.",
-  "error.origin_required": "Die Anfrage wurde abgelehnt: Der Browser hat nicht angegeben, dass sie von der Seite dieser App stammt. Öffnen Sie die App in einem aktuellen Browser erneut.",
+  "error.origin_required": "Anfrage abgelehnt. Öffnen Sie die App in einem aktuellen Browser erneut.",
   "error.internal": "Dieser Vorgang kann nicht ausgeführt werden. Bitte versuchen Sie es später erneut.",
   "error.json_required": "Dieser Vorgang kann nicht ausgeführt werden. Bitte versuchen Sie es später erneut.",
   "error.method_not_allowed": "Dieser Vorgang kann nicht ausgeführt werden. Bitte versuchen Sie es später erneut.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "Nur Mitglieder der Gruppe administrators können den Gruß ändern.",
   "greeting.label": "Neuer Gruß",
   "greeting.save": "Speichern",
-  "greeting.setBy": "{text} — festgelegt von {user}",
+  "greeting.setBy": "Festgelegt von {user}",
   "status.backend": "Backend",
   "status.heading": "Backend-Status",
   "status.package": "Paketname",
   "status.uid": "Läuft als UID",
   "status.user": "Benutzer",
   "status.userAdmin": "{user} (Administrator)",
-  "status.version": "Version"
+  "status.version": "Version",
+  "status.platform": "Plattform"
 }

package/templates/native-go/i18n/messages/en.json

@@ -8,7 +8,7 @@
   "error.bad_request": "Check the entered value and try again.",
   "error.bad_response": "Unable to perform this operation. Please try again later.",
   "error.cross_origin": "Unable to perform this operation. Please try again later.",
-  "error.origin_required": "The request was refused: the browser did not show that it came from this App's page. Open the App again in a current browser.",
+  "error.origin_required": "Request refused. Open the App again in a current browser.",
   "error.internal": "Unable to perform this operation. Please try again later.",
   "error.json_required": "Unable to perform this operation. Please try again later.",
   "error.method_not_allowed": "Unable to perform this operation. Please try again later.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "Only members of the administrators group can change the greeting.",
   "greeting.label": "New greeting",
   "greeting.save": "Save",
-  "greeting.setBy": "{text} — set by {user}",
+  "greeting.setBy": "Set by {user}",
   "status.backend": "Backend",
   "status.heading": "Backend status",
   "status.package": "Package name",
   "status.uid": "Runs as UID",
   "status.user": "User",
   "status.userAdmin": "{user} (administrator)",
-  "status.version": "Version"
+  "status.version": "Version",
+  "status.platform": "Platform"
 }

package/templates/native-go/i18n/messages/es.json

@@ -8,7 +8,7 @@
   "error.bad_request": "Compruebe el valor introducido y vuelva a intentarlo.",
   "error.bad_response": "No se puede realizar esta operación. Vuelva a intentarlo más tarde.",
   "error.cross_origin": "No se puede realizar esta operación. Vuelva a intentarlo más tarde.",
-  "error.origin_required": "Se rechazó la solicitud: el navegador no indicó que procediera de la página de esta App. Vuelva a abrir la App en un navegador actual.",
+  "error.origin_required": "Solicitud rechazada. Vuelva a abrir la App en un navegador actualizado.",
   "error.internal": "No se puede realizar esta operación. Vuelva a intentarlo más tarde.",
   "error.json_required": "No se puede realizar esta operación. Vuelva a intentarlo más tarde.",
   "error.method_not_allowed": "No se puede realizar esta operación. Vuelva a intentarlo más tarde.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "Solo los miembros del grupo administrators pueden cambiar el saludo.",
   "greeting.label": "Nuevo saludo",
   "greeting.save": "Guardar",
-  "greeting.setBy": "{text} — establecido por {user}",
+  "greeting.setBy": "Establecido por {user}",
   "status.backend": "Backend",
   "status.heading": "Estado del backend",
   "status.package": "Nombre del paquete",
   "status.uid": "Se ejecuta como UID",
   "status.user": "Usuario",
   "status.userAdmin": "{user} (administrador)",
-  "status.version": "Versión"
+  "status.version": "Versión",
+  "status.platform": "Plataforma"
 }

package/templates/native-go/i18n/messages/fr.json

@@ -8,7 +8,7 @@
   "error.bad_request": "Vérifiez la valeur saisie et réessayez.",
   "error.bad_response": "Impossible d'effectuer cette opération. Veuillez réessayer ultérieurement.",
   "error.cross_origin": "Impossible d'effectuer cette opération. Veuillez réessayer ultérieurement.",
-  "error.origin_required": "La requête a été refusée : le navigateur n’a pas indiqué qu’elle provenait de la page de cette App. Rouvrez l’App dans un navigateur récent.",
+  "error.origin_required": "Requête refusée. Rouvrez l’App dans un navigateur récent.",
   "error.internal": "Impossible d'effectuer cette opération. Veuillez réessayer ultérieurement.",
   "error.json_required": "Impossible d'effectuer cette opération. Veuillez réessayer ultérieurement.",
   "error.method_not_allowed": "Impossible d'effectuer cette opération. Veuillez réessayer ultérieurement.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "Seuls les membres du groupe administrators peuvent modifier le message d'accueil.",
   "greeting.label": "Nouveau message d'accueil",
   "greeting.save": "Sauvegarder",
-  "greeting.setBy": "{text} — défini par {user}",
+  "greeting.setBy": "Défini par {user}",
   "status.backend": "Backend",
   "status.heading": "Statut du backend",
   "status.package": "Nom du paquet",
   "status.uid": "Exécuté avec l'UID",
   "status.user": "Utilisateur",
   "status.userAdmin": "{user} (administrateur)",
-  "status.version": "Version"
+  "status.version": "Version",
+  "status.platform": "Plateforme"
 }

package/templates/native-go/i18n/messages/it.json

@@ -8,7 +8,7 @@
   "error.bad_request": "Controllare il valore inserito e riprovare.",
   "error.bad_response": "Impossibile eseguire questa operazione. Riprovare più tardi.",
   "error.cross_origin": "Impossibile eseguire questa operazione. Riprovare più tardi.",
-  "error.origin_required": "La richiesta è stata rifiutata: il browser non ha indicato che proviene dalla pagina di questa App. Riaprire l’App in un browser aggiornato.",
+  "error.origin_required": "Richiesta rifiutata. Riaprire l’App in un browser aggiornato.",
   "error.internal": "Impossibile eseguire questa operazione. Riprovare più tardi.",
   "error.json_required": "Impossibile eseguire questa operazione. Riprovare più tardi.",
   "error.method_not_allowed": "Impossibile eseguire questa operazione. Riprovare più tardi.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "Solo i membri del gruppo administrators possono modificare il saluto.",
   "greeting.label": "Nuovo saluto",
   "greeting.save": "Salva",
-  "greeting.setBy": "{text} — impostato da {user}",
+  "greeting.setBy": "Impostato da {user}",
   "status.backend": "Backend",
   "status.heading": "Stato del backend",
   "status.package": "Nome pacchetto",
   "status.uid": "Eseguito come UID",
   "status.user": "Utente",
   "status.userAdmin": "{user} (amministratore)",
-  "status.version": "Versione"
+  "status.version": "Versione",
+  "status.platform": "Piattaforma"
 }

package/templates/native-go/i18n/messages/ja.json

@@ -8,7 +8,7 @@
   "error.bad_request": "入力した値を確認して、もう一度お試しください。",
   "error.bad_response": "この操作は実行できません。後でもう一度お試しください。",
   "error.cross_origin": "この操作は実行できません。後でもう一度お試しください。",
-  "error.origin_required": "リクエストは拒否されました。ブラウザーがこの App のページからのリクエストであることを示しませんでした。最新のブラウザーで App を開き直してください。",
+  "error.origin_required": "リクエストは拒否されました。最新のブラウザーで App を開き直してください。",
   "error.internal": "この操作は実行できません。後でもう一度お試しください。",
   "error.json_required": "この操作は実行できません。後でもう一度お試しください。",
   "error.method_not_allowed": "この操作は実行できません。後でもう一度お試しください。",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "あいさつを変更できるのは administrators グループのメンバーのみです。",
   "greeting.label": "新しいあいさつ",
   "greeting.save": "保存",
-  "greeting.setBy": "{text} — {user} が設定",
+  "greeting.setBy": "{user} が設定",
   "status.backend": "バックエンド",
   "status.heading": "バックエンドの状態",
   "status.package": "パッケージ名",
   "status.uid": "実行 UID",
   "status.user": "ユーザー",
   "status.userAdmin": "{user}（管理者）",
-  "status.version": "バージョン"
+  "status.version": "バージョン",
+  "status.platform": "プラットフォーム"
 }

package/templates/native-go/i18n/messages/ko.json

@@ -8,7 +8,7 @@
   "error.bad_request": "입력한 값을 확인한 후 다시 시도하십시오.",
   "error.bad_response": "이 작업을 수행할 수 없습니다. 나중에 다시 시도하십시오.",
   "error.cross_origin": "이 작업을 수행할 수 없습니다. 나중에 다시 시도하십시오.",
-  "error.origin_required": "요청이 거부되었습니다. 브라우저가 이 App 페이지에서 보낸 요청임을 알리지 않았습니다. 최신 브라우저에서 App을 다시 여십시오.",
+  "error.origin_required": "요청이 거부되었습니다. 최신 브라우저에서 App을 다시 여십시오.",
   "error.internal": "이 작업을 수행할 수 없습니다. 나중에 다시 시도하십시오.",
   "error.json_required": "이 작업을 수행할 수 없습니다. 나중에 다시 시도하십시오.",
   "error.method_not_allowed": "이 작업을 수행할 수 없습니다. 나중에 다시 시도하십시오.",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "administrators 그룹의 구성원만 인사말을 변경할 수 있습니다.",
   "greeting.label": "새 인사말",
   "greeting.save": "저장",
-  "greeting.setBy": "{text} — {user}님이 설정함",
+  "greeting.setBy": "{user}님이 설정함",
   "status.backend": "백엔드",
   "status.heading": "백엔드 상태",
   "status.package": "패키지 이름",
   "status.uid": "실행 UID",
   "status.user": "사용자",
   "status.userAdmin": "{user}(관리자)",
-  "status.version": "버전"
+  "status.version": "버전",
+  "status.platform": "플랫폼"
 }

package/templates/native-go/i18n/messages/zh-CN.json

@@ -8,7 +8,7 @@
   "error.bad_request": "请检查输入的值后重试。",
   "error.bad_response": "无法执行此操作。请稍后再试。",
   "error.cross_origin": "无法执行此操作。请稍后再试。",
-  "error.origin_required": "请求已被拒绝：浏览器没有表明它来自此 App 的页面。请使用新版浏览器重新打开 App。",
+  "error.origin_required": "请求已被拒绝。请使用新版浏览器重新打开 App。",
   "error.internal": "无法执行此操作。请稍后再试。",
   "error.json_required": "无法执行此操作。请稍后再试。",
   "error.method_not_allowed": "无法执行此操作。请稍后再试。",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "只有 administrators 群组的成员可以更改问候语。",
   "greeting.label": "新的问候语",
   "greeting.save": "保存",
-  "greeting.setBy": "{text} — 由 {user} 设置",
+  "greeting.setBy": "由 {user} 设置",
   "status.backend": "后端",
   "status.heading": "后端状态",
   "status.package": "套件名称",
   "status.uid": "运行身份 UID",
   "status.user": "用户帐号",
   "status.userAdmin": "{user}（管理员）",
-  "status.version": "版本"
+  "status.version": "版本",
+  "status.platform": "平台"
 }

package/templates/native-go/i18n/messages/zh-TW.json

@@ -8,7 +8,7 @@
   "error.bad_request": "請檢查輸入的值後再試一次。",
   "error.bad_response": "無法執行此操作。請稍後再試。",
   "error.cross_origin": "無法執行此操作。請稍後再試。",
-  "error.origin_required": "要求已被拒絕：瀏覽器沒有表明它來自這個 App 的頁面。請使用新版瀏覽器重新開啟 App。",
+  "error.origin_required": "要求已被拒絕。請使用新版瀏覽器重新開啟 App。",
   "error.internal": "無法執行此操作。請稍後再試。",
   "error.json_required": "無法執行此操作。請稍後再試。",
   "error.method_not_allowed": "無法執行此操作。請稍後再試。",
@@ -28,12 +28,13 @@
   "greeting.adminOnly": "只有 administrators 群組的成員可以變更問候語。",
   "greeting.label": "新的問候語",
   "greeting.save": "儲存",
-  "greeting.setBy": "{text} — 由 {user} 設定",
+  "greeting.setBy": "由 {user} 設定",
   "status.backend": "後端",
   "status.heading": "後端狀態",
   "status.package": "套件名稱",
   "status.uid": "執行身分 UID",
   "status.user": "使用者帳號",
   "status.userAdmin": "{user}（管理員）",
-  "status.version": "版本"
+  "status.version": "版本",
+  "status.platform": "平台"
 }

package/templates/native-go/ui/app.css

@@ -1,45 +1,77 @@
 /* Scoped to .dsmapp: the DSM desktop shares one page with every other app. */
 .dsmapp {
+  /* Static UI subset from @synopackageland/ui 0.12.0 dsm7-embedded theme. */
+  --ui-font-sans: Verdana, Arial, "Microsoft JhengHei", "Microsoft YaHei", Meiryo, sans-serif;
+  --ui-font-size-sm: 12px;
+  --ui-font-size: 13px;
+  --ui-font-size-lg: 14px;
+  --ui-font-size-title: 16px;
+  --ui-line-height: 20px;
+  --ui-hairline: 1px;
+  --ui-text: #414b55;
+  --ui-text-secondary: #414b55d1;
+  --ui-surface: #fff;
+  --ui-border: #c6d4e0b3;
+  --ui-primary: #057feb;
+  --ui-primary-hover: #0075db;
+  --ui-primary-active: #0062b8;
+  --ui-primary-foreground: #fff;
+  --ui-danger-text: #a81b1b;
+  --ui-radius-sm: 3px;
+  --ui-control-md: 28px;
+  --ui-space-1: 4px;
+  --ui-space-2: 8px;
+  --ui-space-3: 12px;
+  --ui-space-4: 16px;
+  --ui-space-5: 20px;
+  --ui-space-6: 24px;
   box-sizing: border-box;
   height: 100%;
   overflow: auto;
-  padding: 20px 24px;
-  font: 13px/1.5 "Noto Sans", "Helvetica Neue", Arial, sans-serif;
-  color: #1d2733;
-  background: #fff;
+  padding: var(--ui-space-5) var(--ui-space-6);
+  font: var(--ui-font-size)/var(--ui-line-height) var(--ui-font-sans);
+  color: var(--ui-text);
+  background: var(--ui-surface);
 }
-.dsmapp-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
-.dsmapp h1 { margin: 0 0 4px; font-size: 20px; font-weight: 600; }
+.dsmapp *, .dsmapp *::before, .dsmapp *::after { box-sizing: inherit; }
+.dsmapp-header { display: flex; align-items: center; justify-content: space-between; gap: var(--ui-space-3); }
+.dsmapp h1 { margin: 0 0 var(--ui-space-1); font-size: var(--ui-font-size-title); font-weight: 600; }
 .dsmapp-secondary {
-  height: 28px; padding: 0 12px; border: 1px solid #c8d0da; border-radius: 3px;
-  background: #fff; color: inherit; font: inherit; cursor: pointer;
+  height: var(--ui-control-md); padding: 0 var(--ui-space-3); border: 1px solid var(--ui-border); border-radius: var(--ui-radius-sm);
+  background: var(--ui-surface); color: inherit; font: inherit; cursor: pointer;
 }
-.dsmapp h2 { margin: 24px 0 8px; font-size: 14px; font-weight: 600; }
-.dsmapp-greeting { margin: 0 0 12px; font-size: 15px; }
-.dsmapp-form { display: flex; gap: 8px; max-width: 420px; }
+.dsmapp h2 { margin: var(--ui-space-6) 0 var(--ui-space-2); font-size: var(--ui-font-size-lg); font-weight: 600; }
+.dsmapp-greeting { margin: 0 0 var(--ui-space-3); font-size: var(--ui-font-size-lg); }
+.dsmapp-form { display: flex; gap: var(--ui-space-2); max-width: 420px; }
 .dsmapp-form[hidden] { display: none; }
 .dsmapp-form input {
-  flex: 1; height: 28px; padding: 0 8px;
-  border: 1px solid #c8d0da; border-radius: 3px; font: inherit;
+  flex: 1; min-width: 0; height: var(--ui-control-md); padding: 0 var(--ui-space-2);
+  border: 1px solid var(--ui-border); border-radius: var(--ui-radius-sm); font: inherit;
 }
 .dsmapp-form button {
-  height: 30px; padding: 0 16px; border: 0; border-radius: 3px;
-  background: #0086e5; color: #fff; font: inherit; cursor: pointer;
+  height: var(--ui-control-md); padding: 0 var(--ui-space-4); border: 0; border-radius: var(--ui-radius-sm);
+  background: var(--ui-primary); color: var(--ui-primary-foreground); font: inherit; cursor: pointer;
 }
 .dsmapp-form button:disabled { opacity: 0.6; cursor: default; }
-.dsmapp-note { margin: 0; color: #5d6b7a; }
+.dsmapp-note { margin: 0; color: var(--ui-text-secondary); font-size: var(--ui-font-size-sm); }
 .dsmapp-note[hidden] { display: none; }
-.dsmapp-message { min-height: 1.5em; color: #c0392b; }
-.dsmapp-facts { display: grid; grid-template-columns: max-content 1fr; gap: 4px 16px; margin: 0; }
-.dsmapp-facts dt { color: #5d6b7a; }
+.dsmapp-message { min-height: var(--ui-line-height); color: var(--ui-danger-text); }
+.dsmapp-facts { display: grid; grid-template-columns: fit-content(40%) minmax(0, 1fr); gap: var(--ui-space-1) var(--ui-space-4); margin: 0; }
+.dsmapp-facts dt { color: var(--ui-text-secondary); }
 .dsmapp-facts dd { margin: 0; }
 /* SDK portal panel (ctx.portal.mountPanel). */
-.dsmapp-portal-form { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; max-width: 560px; }
-.dsmapp-portal input { height: 28px; padding: 0 8px; border: 1px solid #c8d0da; border-radius: 3px; font: inherit; }
+.dsmapp-portal-form { display: flex; flex-wrap: wrap; align-items: center; gap: var(--ui-space-2); max-width: 560px; }
+.dsmapp-portal input { height: var(--ui-control-md); padding: 0 var(--ui-space-2); border: 1px solid var(--ui-border); border-radius: var(--ui-radius-sm); font: inherit; }
 .dsmapp-portal button {
-  height: 30px; padding: 0 12px; border: 1px solid #c8d0da; border-radius: 3px;
-  background: #fff; color: inherit; font: inherit; cursor: pointer; margin-top: 8px;
+  height: var(--ui-control-md); padding: 0 var(--ui-space-3); border: 1px solid var(--ui-border); border-radius: var(--ui-radius-sm);
+  background: var(--ui-surface); color: inherit; font: inherit; cursor: pointer; margin-top: var(--ui-space-2);
 }
 .dsmapp-portal-form button { margin-top: 0; }
-.dsmapp-portal-form button[type="submit"] { border-color: #0086e5; background: #0086e5; color: #fff; }
-.dsmapp-portal-error { color: #c0392b; }
+.dsmapp-portal-form button[type="submit"] { border-color: var(--ui-primary); background: var(--ui-primary); color: var(--ui-primary-foreground); }
+.dsmapp-portal-error { color: var(--ui-danger-text); }
+.dsmapp-secondary:hover, .dsmapp-portal button:hover { border-color: var(--ui-primary); }
+.dsmapp-form button:hover, .dsmapp-portal-form button[type="submit"]:hover { background: var(--ui-primary-hover); }
+.dsmapp-form button:active, .dsmapp-portal-form button[type="submit"]:active { background: var(--ui-primary-active); }
+.dsmapp input:focus-visible, .dsmapp button:focus-visible { outline: 2px solid var(--ui-primary); outline-offset: 2px; }
+.dsmapp-facts dd { min-width: 0; overflow-wrap: anywhere; }
+@media (resolution >= 2dppx) { .dsmapp { --ui-hairline: 0.5px; } }

package/templates/native-go/ui/app.js

@@ -37,6 +37,7 @@
     var t = ctx.t;
     var status = el("dl", { class: "dsmapp-facts" });
     var greeting = el("p", { class: "dsmapp-greeting", text: t("app.loading") });
+    var setBy = el("p", { class: "dsmapp-note", hidden: "" });
     var input = el("input", { type: "text", maxlength: "200", "aria-label": t("greeting.label"), placeholder: t("greeting.label") });
     var save = el("button", { type: "submit", text: t("greeting.save") });
     var refreshButton = el("button", { type: "button", class: "dsmapp-secondary", text: t("app.refresh") });
@@ -49,6 +50,7 @@
     root.replaceChildren(
       el("div", { class: "dsmapp-header" }, [el("h1", { text: t("app.title") }), refreshButton]),
       greeting,
+      setBy,
       form,
       adminOnly,
       message,
@@ -72,7 +74,8 @@
          [t("status.package"), data.package],
          [t("status.version"), data.version],
          // A Go backend reports go_version; a Python, Node.js or Rust App reports language.
-         [t("status.backend"), (data.language || data.go_version) + " · " + data.platform],
+         [t("status.backend"), data.language || data.go_version],
+         [t("status.platform"), data.platform],
          [t("status.uid"), String(data.process.uid)]].forEach(function (row) {
           status.appendChild(el("dt", { text: row[0] }));
           status.appendChild(el("dd", { text: row[1] }));
@@ -81,9 +84,9 @@
         adminOnly.hidden = data.admin;
       }).catch(showError);
       ctx.call("greeting.get").then(function (data) {
-        greeting.textContent = data.updated_by
-          ? t("greeting.setBy", { text: data.text, user: data.updated_by })
-          : data.text;
+        greeting.textContent = data.text;
+        setBy.textContent = data.updated_by ? t("greeting.setBy", { user: data.updated_by }) : "";
+        setBy.hidden = !data.updated_by;
       }).catch(showError);
     }