Merge branch 'main' into ini2ui

hiifong · web-flow · commit 71eb02515fa9 · 2025-03-01T17:57:32.000+08:00
diff --git a/Makefile b/Makefile
@@ -451,8 +451,7 @@ unit-test-coverage:
 tidy: ## run go mod tidy
 	$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
 	$(GO) mod tidy -compat=$(MIN_GO_VERSION)
-# disabled because of issues related to https://github.com/google/go-licenses/issues/128
-# 	@$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
+	@$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
 
 vendor: go.mod go.sum
 	$(GO) mod vendor
@@ -471,7 +470,9 @@ tidy-check: tidy
 go-licenses: $(GO_LICENSE_FILE) ## regenerate go licenses
 
 $(GO_LICENSE_FILE): go.mod go.sum
-	-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR)
+	@rm -rf $(GO_LICENSE_FILE)
+	$(GO) install $(GO_LICENSES_PACKAGE)
+	-GOOS=linux CGO_ENABLED=1 go-licenses save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
 	$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
 	@rm -rf $(GO_LICENSE_TMP_DIR)
 
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
-	github.com/ProtonMail/go-crypto v1.1.5
+	github.com/ProtonMail/go-crypto v1.1.6
 	github.com/PuerkitoBio/goquery v1.10.2
 	github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
 	github.com/alecthomas/chroma/v2 v2.15.0
diff --git a/go.sum b/go.sum
@@ -71,8 +71,8 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4=
-github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
 github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
 github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go
@@ -110,9 +110,12 @@ func GetPackageDescriptor(ctx context.Context, pv *PackageVersion) (*PackageDesc
 	if err != nil {
 		return nil, err
 	}
-	repository, err := repo_model.GetRepositoryByID(ctx, p.RepoID)
-	if err != nil && !repo_model.IsErrRepoNotExist(err) {
-		return nil, err
+	var repository *repo_model.Repository
+	if p.RepoID > 0 {
+		repository, err = repo_model.GetRepositoryByID(ctx, p.RepoID)
+		if err != nil && !repo_model.IsErrRepoNotExist(err) {
+			return nil, err
+		}
 	}
 	creator, err := user_model.GetUserByID(ctx, pv.CreatorID)
 	if err != nil {
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -2579,7 +2579,6 @@ diff.commit=revize
 diff.git-notes=Poznámky
 diff.data_not_available=Rozdílový obsah není dostupný
 diff.options_button=Možnosti rozdílového porovnání
-diff.show_diff_stats=Zobrazit statistiky
 diff.download_patch=Stáhněte soubor záplaty
 diff.download_diff=Stáhněte rozdílový soubor
 diff.show_split_view=Rozdělené zobrazení
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -2568,7 +2568,6 @@ diff.commit=Commit
 diff.git-notes=Hinweise
 diff.data_not_available=Keine Diff-Daten verfügbar
 diff.options_button=Diff-Optionen
-diff.show_diff_stats=Statistiken anzeigen
 diff.download_patch=Patch-Datei herunterladen
 diff.download_diff=Vergleichs-Datei herunterladen
 diff.show_split_view=Geteilte Ansicht
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -2316,7 +2316,6 @@ diff.commit=υποβολή
 diff.git-notes=Σημειώσεις
 diff.data_not_available=Δεν Υπάρχει Διαθέσιμο Περιεχόμενο Diff
 diff.options_button=Επιλογές Diff
-diff.show_diff_stats=Εμφάνιση Στατιστικών
 diff.download_patch=Λήψη Αρχείου Patch
 diff.download_diff=Λήψη Αρχείου Diff
 diff.show_split_view=Διαιρεμένη Προβολή
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -2297,7 +2297,6 @@ diff.commit=commit
 diff.git-notes=Notas
 diff.data_not_available=El contenido del Diff no está disponible
 diff.options_button=Opciones de diferencias
-diff.show_diff_stats=Mostrar estadísticas
 diff.download_patch=Descargar archivo de parche
 diff.download_diff=Descargar archivo de diferencias
 diff.show_split_view=Dividir vista
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -1777,7 +1777,6 @@ diff.commit=کامیت
 diff.git-notes=یادداشت‌ها
 diff.data_not_available=محتوای تفاوت ها در دسترس نیست
 diff.options_button=تنظیمات (diff) تغییرات
-diff.show_diff_stats=نمایش وضعیت
 diff.download_patch=دانلود پرونده وصله
 diff.download_diff=دانلود فایل تغییرات diff
 diff.show_split_view=مشاهده تقسیم شده
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -2591,7 +2591,6 @@ diff.commit=révision
 diff.git-notes=Notes
 diff.data_not_available=Contenu de la comparaison indisponible
 diff.options_button=Option de Diff
-diff.show_diff_stats=Voir les Statistiques
 diff.download_patch=Télécharger le Fichier Patch
 diff.download_diff=Télécharger le Fichier des Différences
 diff.show_split_view=Vue séparée
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -2593,7 +2593,6 @@ diff.commit=tiomantas
 diff.git-notes=Nótaí
 diff.data_not_available=Níl Ábhar Difríochtaí Ar Fáil
 diff.options_button=Roghanna Diff
-diff.show_diff_stats=Taispeáin Staitisticí
 diff.download_patch=Íoslódáil an comhad paiste
 diff.download_diff=Íoslódáil Comhad Diff
 diff.show_split_view=Amharc Scoilt
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -1098,7 +1098,6 @@ diff.parent=szülő
 diff.commit=commit
 diff.git-notes=Megjegyzések
 diff.data_not_available=A különbségek nem megjeleníthetőek
-diff.show_diff_stats=Statisztikák mutatása
 diff.show_split_view=Osztott nézet
 diff.show_unified_view=Egyesített nézet
 diff.stats_desc=<strong>%d fájl</strong> változott, egészen pontosan <strong>%d új sor hozzáadva</strong> és <strong>%d régi sor törölve</strong>
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -1929,7 +1929,6 @@ diff.commit=commit
 diff.git-notes=Note
 diff.data_not_available=Dati Diff non disponibili
 diff.options_button=Opzioni Diff
-diff.show_diff_stats=Mostra statistiche
 diff.download_patch=Scarica il file Patch
 diff.download_diff=Scarica il file Diff
 diff.show_split_view=Visualizzazione separata
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -2591,7 +2591,6 @@ diff.commit=コミット
 diff.git-notes=Notes
 diff.data_not_available=差分はありません
 diff.options_button=差分オプション
-diff.show_diff_stats=統計情報を表示
 diff.download_patch=Patchファイルをダウンロード
 diff.download_diff=Diffファイルをダウンロード
 diff.show_split_view=分割表示
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -2316,7 +2316,6 @@ diff.commit=revīzija
 diff.git-notes=Piezīmes
 diff.data_not_available=Satura salīdzināšana nav pieejama
 diff.options_button=Salīdzināšanas iespējas
-diff.show_diff_stats=Rādīt statistiku
 diff.download_patch=Lejupielādēt ielāpa failu
 diff.download_diff=Lejupielādēt izmaiņu failu
 diff.show_split_view=Dalītais skats
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -1864,7 +1864,6 @@ diff.commit=commit
 diff.git-notes=Notities
 diff.data_not_available=Diff gegevens niet beschikbaar
 diff.options_button=Diff opties
-diff.show_diff_stats=Statistieken weergeven
 diff.download_patch=Download Patch-bestand
 diff.download_diff=Download Diff-bestand
 diff.show_split_view=Zij-aan-zij weergave
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -1728,7 +1728,6 @@ diff.commit=commit
 diff.git-notes=Notatki
 diff.data_not_available=Informacje nt. zmian nie są dostępne
 diff.options_button=Opcje porównania
-diff.show_diff_stats=Pokaż statystyki
 diff.download_patch=Ściągnij plik aktualizacji
 diff.download_diff=Ściągnij plik porównania
 diff.show_split_view=Widok podzielony
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -2281,7 +2281,6 @@ diff.commit=commit
 diff.git-notes=Notas
 diff.data_not_available=Conteúdo de diff não disponível
 diff.options_button=Opções de diferenças
-diff.show_diff_stats=Mostrar estatísticas
 diff.download_patch=Baixar arquivo de patch
 diff.download_diff=Baixar arquivo de diferenças
 diff.show_split_view=Visão dividida
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -2593,7 +2593,6 @@ diff.commit=cometimento
 diff.git-notes=Notas
 diff.data_not_available=O conteúdo das diferenças não está disponível
 diff.options_button=Opções das diferenças
-diff.show_diff_stats=Mostrar estatísticas
 diff.download_patch=Descarregar ficheiro patch
 diff.download_diff=Descarregar ficheiro diff
 diff.show_split_view=Visualização em 2 colunas
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -2267,7 +2267,6 @@ diff.commit=Коммит
 diff.git-notes=Заметки
 diff.data_not_available=Разница недоступна
 diff.options_button=Опции Diff
-diff.show_diff_stats=Показать статистику
 diff.download_patch=Скачать Patch файл
 diff.download_diff=Скачать Diff файл
 diff.show_split_view=Разделённый вид
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -1739,7 +1739,6 @@ diff.commit=කැප
 diff.git-notes=සටහන්
 diff.data_not_available=Diff අන්තර්ගත ලබාගත නොහැක
 diff.options_button=විවිධ විකල්ප
-diff.show_diff_stats=සංඛ්යාන පෙන්වන්න
 diff.download_patch=පැච් ගොනුව බාගත
 diff.download_diff=බාගත Dff ගොනුව
 diff.show_split_view=භේදය දැක්ම
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -2469,7 +2469,6 @@ diff.commit=işleme
 diff.git-notes=Notlar
 diff.data_not_available=Farklı İçerik Mevut Değil
 diff.options_button=Diff Seçenekleri
-diff.show_diff_stats=İstatistikleri Göster
 diff.download_patch=Yama Dosyasını İndir
 diff.download_diff=Diff Dosyasını İndir
 diff.show_split_view=Görünümü Böl
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -1789,7 +1789,6 @@ diff.commit=коміт
 diff.git-notes=Примітки
 diff.data_not_available=Різниця недоступна
 diff.options_button=Параметри порівняння
-diff.show_diff_stats=Показати статистику
 diff.download_patch=Завантажити патч
 diff.download_diff=Завантажити файл різниці
 diff.show_split_view=Розділений перегляд
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -2568,7 +2568,6 @@ diff.commit=当前提交
 diff.git-notes=Notes
 diff.data_not_available=比较内容不可用
 diff.options_button=Diff 选项
-diff.show_diff_stats=显示统计
 diff.download_patch=下载 Patch 文件
 diff.download_diff=下载 Diff 文件
 diff.show_split_view=分列视图
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -2559,7 +2559,6 @@ diff.commit=當前提交
 diff.git-notes=備註
 diff.data_not_available=沒有內容比較可以使用
 diff.options_button=差異選項
-diff.show_diff_stats=顯示統計資料
 diff.download_patch=下載 Patch 檔
 diff.download_diff=下載差異檔
 diff.show_split_view=分割檢視
diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go
@@ -66,13 +66,15 @@ type PackageMetadataResponse struct {
 }
 
 // PackageVersionMetadata contains package metadata
+// https://getcomposer.org/doc/05-repositories.md#package
 type PackageVersionMetadata struct {
 	*composer_module.Metadata
 	Name    string    `json:"name"`
 	Version string    `json:"version"`
 	Type    string    `json:"type"`
 	Created time.Time `json:"time"`
 	Dist    Dist      `json:"dist"`
+	Source  Source    `json:"source"`
 }
 
 // Dist contains package download information
@@ -82,6 +84,13 @@ type Dist struct {
 	Checksum string `json:"shasum"`
 }
 
+// Source contains package source information
+type Source struct {
+	URL       string `json:"url"`
+	Type      string `json:"type"`
+	Reference string `json:"reference"`
+}
+
 func createPackageMetadataResponse(registryURL string, pds []*packages_model.PackageDescriptor) *PackageMetadataResponse {
 	versions := make([]*PackageVersionMetadata, 0, len(pds))
 
@@ -94,7 +103,7 @@ func createPackageMetadataResponse(registryURL string, pds []*packages_model.Pac
 			}
 		}
 
-		versions = append(versions, &PackageVersionMetadata{
+		pkg := PackageVersionMetadata{
 			Name:     pd.Package.Name,
 			Version:  pd.Version.Version,
 			Type:     packageType,
@@ -105,7 +114,16 @@ func createPackageMetadataResponse(registryURL string, pds []*packages_model.Pac
 				URL:      fmt.Sprintf("%s/files/%s/%s/%s", registryURL, url.PathEscape(pd.Package.LowerName), url.PathEscape(pd.Version.LowerVersion), url.PathEscape(pd.Files[0].File.LowerName)),
 				Checksum: pd.Files[0].Blob.HashSHA1,
 			},
-		})
+		}
+		if pd.Repository != nil {
+			pkg.Source = Source{
+				URL:       pd.Repository.HTMLURL(),
+				Type:      "git",
+				Reference: pd.Version.Version,
+			}
+		}
+
+		versions = append(versions, &pkg)
 	}
 
 	return &PackageMetadataResponse{
diff --git a/services/packages/package_update.go b/services/packages/package_update.go
@@ -44,16 +44,17 @@ func UnlinkFromRepository(ctx context.Context, pkg *packages_model.Package, doer
 	}
 
 	repo, err := repo_model.GetRepositoryByID(ctx, pkg.RepoID)
-	if err != nil {
+	if err != nil && !repo_model.IsErrRepoNotExist(err) {
 		return fmt.Errorf("error getting repository %d: %w", pkg.RepoID, err)
 	}
-
-	perms, err := access_model.GetUserRepoPermission(ctx, repo, doer)
-	if err != nil {
-		return fmt.Errorf("error getting permissions for user %d on repository %d: %w", doer.ID, repo.ID, err)
-	}
-	if !perms.CanWrite(unit.TypePackages) {
-		return util.ErrPermissionDenied
+	if err == nil {
+		perms, err := access_model.GetUserRepoPermission(ctx, repo, doer)
+		if err != nil {
+			return fmt.Errorf("error getting permissions for user %d on repository %d: %w", doer.ID, repo.ID, err)
+		}
+		if !perms.CanWrite(unit.TypePackages) {
+			return util.ErrPermissionDenied
+		}
 	}
 
 	user, err := user_model.GetUserByID(ctx, pkg.OwnerID)
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
@@ -18,6 +18,7 @@ import (
 	"sync"
 	"time"
 
+	user_model "code.gitea.io/gitea/models/user"
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/hostmatcher"
@@ -92,10 +93,10 @@ func newDefaultRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook
 	}
 
 	body = []byte(t.PayloadContent)
-	return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body)
+	return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body)
 }
 
-func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTask, payloadContent []byte) error {
+func addDefaultHeaders(req *http.Request, secret []byte, w *webhook_model.Webhook, t *webhook_model.HookTask, payloadContent []byte) error {
 	var signatureSHA1 string
 	var signatureSHA256 string
 	if len(secret) > 0 {
@@ -112,10 +113,27 @@ func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTa
 
 	event := t.EventType.Event()
 	eventType := string(t.EventType)
+	targetType := "default"
+	if w.IsSystemWebhook {
+		targetType = "system"
+	} else if w.RepoID != 0 {
+		targetType = "repository"
+	} else if w.OwnerID != 0 {
+		owner, err := user_model.GetUserByID(req.Context(), w.OwnerID)
+		if owner != nil && err == nil {
+			if owner.IsOrganization() {
+				targetType = "organization"
+			} else {
+				targetType = "user"
+			}
+		}
+	}
+
 	req.Header.Add("X-Gitea-Delivery", t.UUID)
 	req.Header.Add("X-Gitea-Event", event)
 	req.Header.Add("X-Gitea-Event-Type", eventType)
 	req.Header.Add("X-Gitea-Signature", signatureSHA256)
+	req.Header.Add("X-Gitea-Hook-Installation-Target-Type", targetType)
 	req.Header.Add("X-Gogs-Delivery", t.UUID)
 	req.Header.Add("X-Gogs-Event", event)
 	req.Header.Add("X-Gogs-Event-Type", eventType)
@@ -125,6 +143,7 @@ func addDefaultHeaders(req *http.Request, secret []byte, t *webhook_model.HookTa
 	req.Header["X-GitHub-Delivery"] = []string{t.UUID}
 	req.Header["X-GitHub-Event"] = []string{event}
 	req.Header["X-GitHub-Event-Type"] = []string{eventType}
+	req.Header["X-GitHub-Hook-Installation-Target-Type"] = []string{targetType}
 	return nil
 }
 
diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go
@@ -56,7 +56,7 @@ func newMatrixRequest(_ context.Context, w *webhook_model.Webhook, t *webhook_mo
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body) // likely useless, but has always been sent historially
+	return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body) // likely useless, but has always been sent historially
 }
 
 const matrixPayloadSizeLimit = 1024 * 64
diff --git a/services/webhook/payloader.go b/services/webhook/payloader.go
@@ -107,7 +107,7 @@ func newJSONRequest[T any](pc payloadConvertor[T], w *webhook_model.Webhook, t *
 	req.Header.Set("Content-Type", "application/json")
 
 	if withDefaultHeaders {
-		return req, body, addDefaultHeaders(req, []byte(w.Secret), t, body)
+		return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body)
 	}
 	return req, body, nil
 }
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl
diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl
diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go
diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
diff --git a/web_src/js/features/common-page.ts b/web_src/js/features/common-page.ts
diff --git a/web_src/js/features/comp/ReactionSelector.ts b/web_src/js/features/comp/ReactionSelector.ts
diff --git a/web_src/js/features/repo-diff.ts b/web_src/js/features/repo-diff.ts
diff --git a/web_src/js/features/repo-graph.ts b/web_src/js/features/repo-graph.ts
diff --git a/web_src/js/index.ts b/web_src/js/index.ts
diff --git a/web_src/js/modules/dirauto.ts b/web_src/js/modules/dirauto.ts
diff --git a/web_src/js/modules/observer.ts b/web_src/js/modules/observer.ts
