Compare commits
13 Commits
v2023.4.2-
...
v2023.4.6-
Author | SHA1 | Date | |
---|---|---|---|
da73b842e1 | |||
55d7241d95 | |||
240b07af66 | |||
68e35bf5a6 | |||
4bc2d864ad | |||
dc18381dea | |||
1dde96043a | |||
f758acb4e5 | |||
054e80bbfb | |||
32c6f0a77e | |||
050e529f0a | |||
006f13bc7b | |||
84c8fd51f6 |
49
Jenkinsfile
vendored
Normal file
49
Jenkinsfile
vendored
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
@Library('cadoles') _
|
||||||
|
|
||||||
|
pipeline {
|
||||||
|
agent {
|
||||||
|
dockerfile {
|
||||||
|
label 'docker'
|
||||||
|
filename 'Dockerfile'
|
||||||
|
dir 'misc/jenkins'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Run unit tests') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
sh 'make GOTEST_ARGS="-timeout 10m -count=1 -v" test'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Release') {
|
||||||
|
when {
|
||||||
|
anyOf {
|
||||||
|
branch 'master'
|
||||||
|
branch 'develop'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
withCredentials([
|
||||||
|
usernamePassword([
|
||||||
|
credentialsId: 'forge-jenkins',
|
||||||
|
usernameVariable: 'GITEA_RELEASE_USERNAME',
|
||||||
|
passwordVariable: 'GITEA_RELEASE_PASSWORD'
|
||||||
|
])
|
||||||
|
]) {
|
||||||
|
sh 'make gitea-release'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
cleanWs()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
10
Makefile
10
Makefile
@ -2,7 +2,7 @@ LINT_ARGS ?= --timeout 5m
|
|||||||
GITCHLOG_ARGS ?=
|
GITCHLOG_ARGS ?=
|
||||||
SHELL := /bin/bash
|
SHELL := /bin/bash
|
||||||
|
|
||||||
GOTEST_ARGS ?= -short
|
GOTEST_ARGS ?= -short -timeout 60s
|
||||||
|
|
||||||
ESBUILD_VERSION ?= v0.17.5
|
ESBUILD_VERSION ?= v0.17.5
|
||||||
|
|
||||||
@ -10,7 +10,7 @@ GIT_VERSION := $(shell git describe --always)
|
|||||||
DATE_VERSION := $(shell date +%Y.%-m.%-d)
|
DATE_VERSION := $(shell date +%Y.%-m.%-d)
|
||||||
FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)
|
FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)
|
||||||
|
|
||||||
build: build-edge-cli
|
build: build-edge-cli build-client-sdk-test-app
|
||||||
|
|
||||||
watch:
|
watch:
|
||||||
go run -mod=readonly github.com/cortesi/modd/cmd/modd@latest
|
go run -mod=readonly github.com/cortesi/modd/cmd/modd@latest
|
||||||
@ -30,10 +30,12 @@ build-edge-cli: build-sdk
|
|||||||
-o ./bin/cli \
|
-o ./bin/cli \
|
||||||
./cmd/cli
|
./cmd/cli
|
||||||
|
|
||||||
|
build-client-sdk-test-app:
|
||||||
|
cd misc/client-sdk-testsuite && $(MAKE) dist
|
||||||
|
|
||||||
install-git-hooks:
|
install-git-hooks:
|
||||||
git config core.hooksPath .githooks
|
git config core.hooksPath .githooks
|
||||||
|
|
||||||
|
|
||||||
tools/esbuild/bin/esbuild:
|
tools/esbuild/bin/esbuild:
|
||||||
mkdir -p tools/esbuild/bin
|
mkdir -p tools/esbuild/bin
|
||||||
curl -fsSL https://esbuild.github.io/dl/$(ESBUILD_VERSION) | sh
|
curl -fsSL https://esbuild.github.io/dl/$(ESBUILD_VERSION) | sh
|
||||||
@ -53,7 +55,7 @@ pkg/sdk/client/dist/client.js: tools/esbuild/bin/esbuild node_modules
|
|||||||
--global-name=Edge \
|
--global-name=Edge \
|
||||||
--define:global=window \
|
--define:global=window \
|
||||||
--platform=browser \
|
--platform=browser \
|
||||||
--footer:js="Edge=Edge.default;" \
|
--footer:js="EdgeFrame=Edge.crossFrameMessenger;Edge=Edge.client" \
|
||||||
--outfile=pkg/sdk/client/dist/client.js
|
--outfile=pkg/sdk/client/dist/client.js
|
||||||
|
|
||||||
node_modules:
|
node_modules:
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@ -22,7 +23,7 @@ import (
|
|||||||
"forge.cadoles.com/arcad/edge/pkg/module/blob"
|
"forge.cadoles.com/arcad/edge/pkg/module/blob"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/module/cast"
|
"forge.cadoles.com/arcad/edge/pkg/module/cast"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/module/fetch"
|
"forge.cadoles.com/arcad/edge/pkg/module/fetch"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/module/net"
|
netModule "forge.cadoles.com/arcad/edge/pkg/module/net"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/storage"
|
"forge.cadoles.com/arcad/edge/pkg/storage"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
|
"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
|
||||||
"gitlab.com/wpetit/goweb/logger"
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
@ -72,7 +73,7 @@ func RunCommand() *cli.Command {
|
|||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "storage-file",
|
Name: "storage-file",
|
||||||
Usage: "use `FILE` for SQLite storage database",
|
Usage: "use `FILE` for SQLite storage database",
|
||||||
Value: ".edge/%APPID%/data.sqlite",
|
Value: ".edge/%APPID%/data.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "accounts-file",
|
Name: "accounts-file",
|
||||||
@ -173,7 +174,7 @@ func getServerModules(bus bus.Bus, ds storage.DocumentStore, bs storage.BlobStor
|
|||||||
module.ConsoleModuleFactory(),
|
module.ConsoleModuleFactory(),
|
||||||
cast.CastModuleFactory(),
|
cast.CastModuleFactory(),
|
||||||
module.LifecycleModuleFactory(),
|
module.LifecycleModuleFactory(),
|
||||||
net.ModuleFactory(bus),
|
netModule.ModuleFactory(bus),
|
||||||
module.RPCModuleFactory(bus),
|
module.RPCModuleFactory(bus),
|
||||||
module.StoreModuleFactory(ds),
|
module.StoreModuleFactory(ds),
|
||||||
blob.ModuleFactory(bus, bs),
|
blob.ModuleFactory(bus, bs),
|
||||||
@ -200,12 +201,23 @@ func getServerModules(bus bus.Bus, ds storage.DocumentStore, bs storage.BlobStor
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
appModule.ModuleFactory(appModuleMemory.NewRepository(
|
appModule.ModuleFactory(appModuleMemory.NewRepository(
|
||||||
func(ctx context.Context, i app.ID) (string, error) {
|
func(ctx context.Context, id app.ID, from string) (string, error) {
|
||||||
if strings.HasPrefix(address, ":") {
|
addr := address
|
||||||
address = "0.0.0.0" + address
|
if strings.HasPrefix(addr, ":") {
|
||||||
|
addr = "0.0.0.0" + addr
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Sprintf("http://%s", address), nil
|
host, port, err := net.SplitHostPort(addr)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
addr, err = findMatchingDeviceAddress(ctx, from, host)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf("http://%s:%s", addr, port), nil
|
||||||
},
|
},
|
||||||
manifest,
|
manifest,
|
||||||
)),
|
)),
|
||||||
@ -284,3 +296,52 @@ func loadLocalAccounts(path string) ([]authHTTP.LocalAccount, error) {
|
|||||||
|
|
||||||
return accounts, nil
|
return accounts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func findMatchingDeviceAddress(ctx context.Context, from string, defaultAddr string) (string, error) {
|
||||||
|
if from == "" {
|
||||||
|
return defaultAddr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
fromIP := net.ParseIP(from)
|
||||||
|
|
||||||
|
if fromIP == nil {
|
||||||
|
return defaultAddr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ifaces, err := net.Interfaces()
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, ifa := range ifaces {
|
||||||
|
addrs, err := ifa.Addrs()
|
||||||
|
if err != nil {
|
||||||
|
logger.Error(
|
||||||
|
ctx, "could not retrieve iface adresses",
|
||||||
|
logger.E(errors.WithStack(err)), logger.F("iface", ifa.Name),
|
||||||
|
)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, addr := range addrs {
|
||||||
|
ip, network, err := net.ParseCIDR(addr.String())
|
||||||
|
if err != nil {
|
||||||
|
logger.Error(
|
||||||
|
ctx, "could not parse address",
|
||||||
|
logger.E(errors.WithStack(err)), logger.F("address", addr.String()),
|
||||||
|
)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if !network.Contains(fromIP) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
return ip.String(), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultAddr, nil
|
||||||
|
}
|
||||||
|
40
cmd/cli/command/cast/load_url.go
Normal file
40
cmd/cli/command/cast/load_url.go
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
package cast
|
||||||
|
|
||||||
|
import (
|
||||||
|
"forge.cadoles.com/arcad/edge/pkg/module/cast"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func LoadURLCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "load-url",
|
||||||
|
Usage: "Load `URL` in casting device",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "device",
|
||||||
|
Aliases: []string{"d"},
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "url",
|
||||||
|
Aliases: []string{"u"},
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Action: func(ctx *cli.Context) error {
|
||||||
|
device := ctx.String("device")
|
||||||
|
url := ctx.String("url")
|
||||||
|
|
||||||
|
if err := cast.StopCast(ctx.Context, device); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := cast.LoadURL(ctx.Context, device, url); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
16
cmd/cli/command/cast/root.go
Normal file
16
cmd/cli/command/cast/root.go
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
package cast
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Root() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "cast",
|
||||||
|
Usage: "Cast related commands",
|
||||||
|
Subcommands: []*cli.Command{
|
||||||
|
ScanCommand(),
|
||||||
|
LoadURLCommand(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
37
cmd/cli/command/cast/scan.go
Normal file
37
cmd/cli/command/cast/scan.go
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
package cast
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/barnybug/go-cast/discovery"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ScanCommand() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "scan",
|
||||||
|
Usage: "Scan network for casting devices",
|
||||||
|
Flags: []cli.Flag{},
|
||||||
|
Action: func(ctx *cli.Context) error {
|
||||||
|
service := discovery.NewService(ctx.Context)
|
||||||
|
defer service.Stop()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
if err := service.Run(ctx.Context, time.Second); err != nil && !errors.Is(err, context.DeadlineExceeded) {
|
||||||
|
log.Fatalf("%+v", errors.WithStack(err))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
found := service.Found()
|
||||||
|
|
||||||
|
for device := range found {
|
||||||
|
log.Printf("[DEVICE] %s %s %s:%d", device.Uuid(), device.Name(), device.IP().String(), device.Port())
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
@ -3,8 +3,9 @@ package main
|
|||||||
import (
|
import (
|
||||||
"forge.cadoles.com/arcad/edge/cmd/cli/command"
|
"forge.cadoles.com/arcad/edge/cmd/cli/command"
|
||||||
"forge.cadoles.com/arcad/edge/cmd/cli/command/app"
|
"forge.cadoles.com/arcad/edge/cmd/cli/command/app"
|
||||||
|
"forge.cadoles.com/arcad/edge/cmd/cli/command/cast"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
command.Main(app.Root())
|
command.Main(app.Root(), cast.Root())
|
||||||
}
|
}
|
||||||
|
@ -1,68 +1,14 @@
|
|||||||
# API Client
|
# API Client
|
||||||
|
|
||||||
## Méthodes
|
## Usage
|
||||||
|
|
||||||
### `Edge.connect(): Promise`
|
Afin de pouvoir utiliser le SDK "client", vous devez inclure dans la page HTML de votre application la balise `<script>` suivante:
|
||||||
|
|
||||||
> `TODO`
|
```html
|
||||||
|
<script src="/edge/sdk/client.js"></script>
|
||||||
### `Edge.disconnect(): void`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
|
|
||||||
|
|
||||||
### `Edge.send(message: Object): void`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
|
|
||||||
|
|
||||||
### `Edge.rpc(method: string, params: Object): Promise`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
#### Exemple
|
|
||||||
|
|
||||||
**Côté serveur**
|
|
||||||
|
|
||||||
```js
|
|
||||||
function onInit() {
|
|
||||||
rpc.register(echo);
|
|
||||||
}
|
|
||||||
|
|
||||||
function echo(ctx, params) {
|
|
||||||
return params;
|
|
||||||
}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Côté client**
|
Vous pourrez ensuite accéder aux variables globales suivantes:
|
||||||
|
|
||||||
```js
|
- [`Edge`](./edge.md) - Client principal d'échange avec le serveur
|
||||||
Edge.connect().then(() => {
|
- [`EdgeFrame`](./edge-frame.md)
|
||||||
Edge.rpc("echo", { hello: "world!" })
|
|
||||||
.then(result => console.log(result))
|
|
||||||
.catch(err => console.error(err));
|
|
||||||
});
|
|
||||||
```
|
|
||||||
|
|
||||||
### `Edge.upload(blob: Blob, metadata: Object): Promise`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
|
|
||||||
### `Edge.blobUrl(bucketName: string, blobId: string): string`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
|
|
||||||
### `Edge.externalUrl(url: string): string`
|
|
||||||
|
|
||||||
Retourne une URL "locale" permettant d'accéder à une ressource externe, en fonction de règles propres à l'application. Voir module [`fetch`](../server-api/fetch.md).
|
|
||||||
|
|
||||||
## Événements
|
|
||||||
|
|
||||||
### `"message"`
|
|
||||||
|
|
||||||
> `TODO`
|
|
||||||
|
|
||||||
#### Exemple
|
|
||||||
|
|
||||||
```js
|
|
||||||
Edge.addEventListener("message", evt => console.log(evt.detail));
|
|
||||||
```
|
|
30
doc/apps/client-api/edge-frame.md
Normal file
30
doc/apps/client-api/edge-frame.md
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# `EdgeFrame`
|
||||||
|
|
||||||
|
## Méthodes
|
||||||
|
|
||||||
|
### `EdgeFrame.addEventListener(name: string, listener: (event) => void)`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
## Événements
|
||||||
|
|
||||||
|
### `"title_changed"`
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface TitleChangedEvent {
|
||||||
|
detail: {
|
||||||
|
title: string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### `"size_changed"`
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
interface SizeChangedEvent {
|
||||||
|
detail: {
|
||||||
|
width: number
|
||||||
|
height: number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
68
doc/apps/client-api/edge.md
Normal file
68
doc/apps/client-api/edge.md
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
# `Edge`
|
||||||
|
|
||||||
|
## Méthodes
|
||||||
|
|
||||||
|
### `Edge.connect(): Promise`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
### `Edge.disconnect(): void`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
|
||||||
|
### `Edge.send(message: Object): void`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
|
||||||
|
### `Edge.rpc(method: string, params: Object): Promise`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
#### Exemple
|
||||||
|
|
||||||
|
**Côté serveur**
|
||||||
|
|
||||||
|
```js
|
||||||
|
function onInit() {
|
||||||
|
rpc.register(echo);
|
||||||
|
}
|
||||||
|
|
||||||
|
function echo(ctx, params) {
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Côté client**
|
||||||
|
|
||||||
|
```js
|
||||||
|
Edge.connect().then(() => {
|
||||||
|
Edge.rpc("echo", { hello: "world!" })
|
||||||
|
.then(result => console.log(result))
|
||||||
|
.catch(err => console.error(err));
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
### `Edge.upload(blob: Blob, metadata: Object): Promise`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
### `Edge.blobUrl(bucketName: string, blobId: string): string`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
### `Edge.externalUrl(url: string): string`
|
||||||
|
|
||||||
|
Retourne une URL "locale" permettant d'accéder à une ressource externe, en fonction de règles propres à l'application. Voir module [`fetch`](../server-api/fetch.md).
|
||||||
|
|
||||||
|
## Événements
|
||||||
|
|
||||||
|
### `"message"`
|
||||||
|
|
||||||
|
> `TODO`
|
||||||
|
|
||||||
|
#### Exemple
|
||||||
|
|
||||||
|
```js
|
||||||
|
Edge.addEventListener("message", evt => console.log(evt.detail));
|
||||||
|
```
|
@ -29,7 +29,7 @@ Récupère les informations de l'application identifiée par `appId`.
|
|||||||
|
|
||||||
Objet `Manifest` associé à l'application, ou `null` si aucune application n'a été trouvée correspondant à l'identifiant.
|
Objet `Manifest` associé à l'application, ou `null` si aucune application n'a été trouvée correspondant à l'identifiant.
|
||||||
|
|
||||||
### `app.getUrl(ctx: Context, appId: string): Manifest`
|
### `app.getUrl(ctx: Context, appId: string, from: string = ''): Manifest`
|
||||||
|
|
||||||
Retourne l'URL permettant d'accéder à l'application identifiée par `appId`.
|
Retourne l'URL permettant d'accéder à l'application identifiée par `appId`.
|
||||||
|
|
||||||
@ -37,6 +37,7 @@ Retourne l'URL permettant d'accéder à l'application identifiée par `appId`.
|
|||||||
|
|
||||||
- `ctx` **Context** Le contexte d'exécution. Voir la documentation du module [`context`](./context.md)
|
- `ctx` **Context** Le contexte d'exécution. Voir la documentation du module [`context`](./context.md)
|
||||||
- `appId` **string** Identifiant de l'application
|
- `appId` **string** Identifiant de l'application
|
||||||
|
- `from` **string** Adresse IP qui accédera à l'application (permet de générer la bonne URL vis à vis du réseau d'origine)
|
||||||
|
|
||||||
#### Valeur de retour
|
#### Valeur de retour
|
||||||
|
|
||||||
|
3
go.mod
3
go.mod
@ -8,6 +8,7 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/brutella/dnssd v1.2.6 // indirect
|
||||||
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
|
||||||
github.com/goccy/go-json v0.9.11 // indirect
|
github.com/goccy/go-json v0.9.11 // indirect
|
||||||
github.com/gogo/protobuf v0.0.0-20161014173244-50d1bd39ce4e // indirect
|
github.com/gogo/protobuf v0.0.0-20161014173244-50d1bd39ce4e // indirect
|
||||||
@ -19,7 +20,7 @@ require (
|
|||||||
github.com/lestrrat-go/httprc v1.0.4 // indirect
|
github.com/lestrrat-go/httprc v1.0.4 // indirect
|
||||||
github.com/lestrrat-go/iter v1.0.2 // indirect
|
github.com/lestrrat-go/iter v1.0.2 // indirect
|
||||||
github.com/lestrrat-go/option v1.0.0 // indirect
|
github.com/lestrrat-go/option v1.0.0 // indirect
|
||||||
github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8 // indirect
|
github.com/miekg/dns v1.1.50 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
13
go.sum
13
go.sum
@ -54,6 +54,8 @@ github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MR
|
|||||||
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
|
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
|
||||||
github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 h1:JW4WZlqyaNWUUahfr7MigeDW6jmtam5cTzzo1lwsFhE=
|
github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 h1:JW4WZlqyaNWUUahfr7MigeDW6jmtam5cTzzo1lwsFhE=
|
||||||
github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692/go.mod h1:Au0ipPuCBA7zsOC61SnyrYetm8VT3vo1UJtwHeYke44=
|
github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692/go.mod h1:Au0ipPuCBA7zsOC61SnyrYetm8VT3vo1UJtwHeYke44=
|
||||||
|
github.com/brutella/dnssd v1.2.6 h1:/0P13JkHLRzeLQkWRPEn4hJCr4T3NfknIFw3aNPIC34=
|
||||||
|
github.com/brutella/dnssd v1.2.6/go.mod h1:JoW2sJUrmVIef25G6lrLj7HS6Xdwh6q8WUIvMkkBYXs=
|
||||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||||
@ -232,6 +234,8 @@ github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peK
|
|||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8 h1:ALvJ9V8nNf04PFHMR2sot56N/pjrx5LzZGvUlnhdiCE=
|
github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8 h1:ALvJ9V8nNf04PFHMR2sot56N/pjrx5LzZGvUlnhdiCE=
|
||||||
github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
||||||
|
github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
|
||||||
|
github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
|
||||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||||
@ -283,6 +287,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
|
|||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
gitlab.com/wpetit/goweb v0.0.0-20230206085656-dec695f0e2e9 h1:6JlkcdjYVQglPWYuemK2MoZAtRE4vFx85zLXflGIyI8=
|
gitlab.com/wpetit/goweb v0.0.0-20230206085656-dec695f0e2e9 h1:6JlkcdjYVQglPWYuemK2MoZAtRE4vFx85zLXflGIyI8=
|
||||||
gitlab.com/wpetit/goweb v0.0.0-20230206085656-dec695f0e2e9/go.mod h1:3sus4zjoUv1GB7eDLL60QaPkUnXJCWBpjvbe0jWifeY=
|
gitlab.com/wpetit/goweb v0.0.0-20230206085656-dec695f0e2e9/go.mod h1:3sus4zjoUv1GB7eDLL60QaPkUnXJCWBpjvbe0jWifeY=
|
||||||
@ -340,6 +345,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
|
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
|
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
|
||||||
@ -376,6 +382,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY
|
|||||||
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
|
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
@ -402,6 +410,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -439,10 +448,13 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@ -521,6 +533,7 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
|
|||||||
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
|
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
|
||||||
|
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
|
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
|
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
|
||||||
|
@ -26,12 +26,20 @@ describe('App Module', function() {
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should retrieve requested app url', function() {
|
it('should retrieve requested app url without from address', function() {
|
||||||
return Edge.rpc("getAppUrl", { appId: "edge.sdk.client.test" })
|
return Edge.rpc("getAppUrl", { appId: "edge.sdk.client.test" })
|
||||||
.then(url => {
|
.then(url => {
|
||||||
console.log("getAppUrl result:", url);
|
console.log("getAppUrl result:", url);
|
||||||
chai.assert.isNotEmpty(url);
|
chai.assert.isNotEmpty(url);
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should retrieve requested app url with from address', function() {
|
||||||
|
return Edge.rpc("getAppUrl", { appId: "edge.sdk.client.test", from: "127.0.0.2" })
|
||||||
|
.then(url => {
|
||||||
|
console.log("getAppUrl result:", url);
|
||||||
|
chai.assert.isNotEmpty(url);
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
@ -1,4 +1,5 @@
|
|||||||
Edge.debug = true;
|
Edge.debug = true;
|
||||||
|
EdgeFrame.debug = true;
|
||||||
|
|
||||||
describe('Edge', function() {
|
describe('Edge', function() {
|
||||||
|
|
||||||
|
@ -96,7 +96,9 @@ function getApp(ctx, params) {
|
|||||||
|
|
||||||
function getAppUrl(ctx, params) {
|
function getAppUrl(ctx, params) {
|
||||||
var appId = params.appId;
|
var appId = params.appId;
|
||||||
return app.getUrl(ctx, appId);
|
var from = params.from;
|
||||||
|
|
||||||
|
return app.getUrl(ctx, appId, from ? from : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
function onClientFetch(ctx, url, remoteAddr) {
|
function onClientFetch(ctx, url, remoteAddr) {
|
||||||
|
28
misc/jenkins/Dockerfile
Normal file
28
misc/jenkins/Dockerfile
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
FROM reg.cadoles.com/proxy_cache/library/ubuntu:22.04
|
||||||
|
|
||||||
|
ARG HTTP_PROXY=
|
||||||
|
ARG HTTPS_PROXY=
|
||||||
|
ARG http_proxy=
|
||||||
|
ARG https_proxy=
|
||||||
|
ARG GO_VERSION=1.19.2
|
||||||
|
|
||||||
|
# Install dev environment dependencies
|
||||||
|
RUN export DEBIAN_FRONTEND=noninteractive &&\
|
||||||
|
apt-get update -y &&\
|
||||||
|
apt-get install -y --no-install-recommends curl ca-certificates build-essential wget unzip tar git jq
|
||||||
|
|
||||||
|
# Install Go
|
||||||
|
RUN mkdir -p /tmp \
|
||||||
|
&& wget -O /tmp/go${GO_VERSION}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz \
|
||||||
|
&& rm -rf /usr/local/go \
|
||||||
|
&& mkdir -p /usr/local \
|
||||||
|
&& tar -C /usr/local -xzf /tmp/go${GO_VERSION}.linux-amd64.tar.gz
|
||||||
|
|
||||||
|
ENV PATH="${PATH}:/usr/local/go/bin"
|
||||||
|
|
||||||
|
# Add LetsEncrypt certificates
|
||||||
|
RUN curl -k https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash
|
||||||
|
|
||||||
|
# Install NodeJS
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
|
||||||
|
&& apt-get install -y nodejs
|
@ -7,7 +7,7 @@ modd.conf
|
|||||||
{
|
{
|
||||||
prep: make build-sdk
|
prep: make build-sdk
|
||||||
prep: cd misc/client-sdk-testsuite && make dist
|
prep: cd misc/client-sdk-testsuite && make dist
|
||||||
prep: make GOTEST_ARGS="-short" test
|
|
||||||
prep: make build
|
prep: make build
|
||||||
|
prep: make GOTEST_ARGS="-short" test
|
||||||
daemon: bin/cli app run -p misc/client-sdk-testsuite/dist
|
daemon: bin/cli app run -p misc/client-sdk-testsuite/dist
|
||||||
}
|
}
|
||||||
|
@ -19,8 +19,8 @@ func TestAppModuleWithMemoryRepository(t *testing.T) {
|
|||||||
module.ContextModuleFactory(),
|
module.ContextModuleFactory(),
|
||||||
module.ConsoleModuleFactory(),
|
module.ConsoleModuleFactory(),
|
||||||
appModule.ModuleFactory(NewRepository(
|
appModule.ModuleFactory(NewRepository(
|
||||||
func(ctx context.Context, id app.ID) (string, error) {
|
func(ctx context.Context, id app.ID, from string) (string, error) {
|
||||||
return fmt.Sprintf("http//%s.example.com", id), nil
|
return fmt.Sprintf("http//%s.example.com?from=%s", id, from), nil
|
||||||
},
|
},
|
||||||
&app.Manifest{
|
&app.Manifest{
|
||||||
ID: "dummy1.arcad.app",
|
ID: "dummy1.arcad.app",
|
||||||
|
@ -8,7 +8,7 @@ import (
|
|||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetURLFunc func(context.Context, app.ID) (string, error)
|
type GetURLFunc func(context.Context, app.ID, string) (string, error)
|
||||||
|
|
||||||
type Repository struct {
|
type Repository struct {
|
||||||
getURL GetURLFunc
|
getURL GetURLFunc
|
||||||
@ -16,8 +16,8 @@ type Repository struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GetURL implements app.Repository
|
// GetURL implements app.Repository
|
||||||
func (r *Repository) GetURL(ctx context.Context, id app.ID) (string, error) {
|
func (r *Repository) GetURL(ctx context.Context, id app.ID, from string) (string, error) {
|
||||||
url, err := r.getURL(ctx, id)
|
url, err := r.getURL(ctx, id, from)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", errors.WithStack(err)
|
return "", errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,12 @@ func (m *Module) getURL(call goja.FunctionCall, rt *goja.Runtime) goja.Value {
|
|||||||
ctx := util.AssertContext(call.Argument(0), rt)
|
ctx := util.AssertContext(call.Argument(0), rt)
|
||||||
appID := assertAppID(call.Argument(1), rt)
|
appID := assertAppID(call.Argument(1), rt)
|
||||||
|
|
||||||
url, err := m.repository.GetURL(ctx, appID)
|
var from string
|
||||||
|
if len(call.Arguments) > 2 {
|
||||||
|
from = util.AssertString(call.Argument(2), rt)
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := m.repository.GetURL(ctx, appID, from)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(rt.ToValue(errors.WithStack(err)))
|
panic(rt.ToValue(errors.WithStack(err)))
|
||||||
}
|
}
|
||||||
|
@ -9,5 +9,5 @@ import (
|
|||||||
type Repository interface {
|
type Repository interface {
|
||||||
List(context.Context) ([]*app.Manifest, error)
|
List(context.Context) ([]*app.Manifest, error)
|
||||||
Get(context.Context, app.ID) (*app.Manifest, error)
|
Get(context.Context, app.ID) (*app.Manifest, error)
|
||||||
GetURL(context.Context, app.ID) (string, error)
|
GetURL(context.Context, app.ID, string) (string, error)
|
||||||
}
|
}
|
||||||
|
@ -30,12 +30,12 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type LocalHandler struct {
|
type LocalHandler struct {
|
||||||
router chi.Router
|
router chi.Router
|
||||||
algo jwa.KeyAlgorithm
|
algo jwa.KeyAlgorithm
|
||||||
key jwk.Key
|
key jwk.Key
|
||||||
cookieDomain string
|
getCookieDomain GetCookieDomainFunc
|
||||||
cookieDuration time.Duration
|
cookieDuration time.Duration
|
||||||
accounts map[string]LocalAccount
|
accounts map[string]LocalAccount
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *LocalHandler) initRouter(prefix string) {
|
func (h *LocalHandler) initRouter(prefix string) {
|
||||||
@ -118,10 +118,18 @@ func (h *LocalHandler) handleForm(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cookieDomain, err := h.getCookieDomain(r)
|
||||||
|
if err != nil {
|
||||||
|
logger.Error(ctx, "could not retrieve cookie domain", logger.E(errors.WithStack(err)))
|
||||||
|
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cookie := http.Cookie{
|
cookie := http.Cookie{
|
||||||
Name: auth.CookieName,
|
Name: auth.CookieName,
|
||||||
Value: string(token),
|
Value: string(token),
|
||||||
Domain: h.cookieDomain,
|
Domain: cookieDomain,
|
||||||
HttpOnly: false,
|
HttpOnly: false,
|
||||||
Expires: time.Now().Add(h.cookieDuration),
|
Expires: time.Now().Add(h.cookieDuration),
|
||||||
Path: "/",
|
Path: "/",
|
||||||
@ -133,12 +141,20 @@ func (h *LocalHandler) handleForm(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *LocalHandler) handleLogout(w http.ResponseWriter, r *http.Request) {
|
func (h *LocalHandler) handleLogout(w http.ResponseWriter, r *http.Request) {
|
||||||
|
cookieDomain, err := h.getCookieDomain(r)
|
||||||
|
if err != nil {
|
||||||
|
logger.Error(r.Context(), "could not retrieve cookie domain", logger.E(errors.WithStack(err)))
|
||||||
|
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
http.SetCookie(w, &http.Cookie{
|
http.SetCookie(w, &http.Cookie{
|
||||||
Name: auth.CookieName,
|
Name: auth.CookieName,
|
||||||
Value: "",
|
Value: "",
|
||||||
HttpOnly: false,
|
HttpOnly: false,
|
||||||
Expires: time.Unix(0, 0),
|
Expires: time.Unix(0, 0),
|
||||||
Domain: h.cookieDomain,
|
Domain: cookieDomain,
|
||||||
Path: "/",
|
Path: "/",
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -170,11 +186,11 @@ func NewLocalHandler(algo jwa.KeyAlgorithm, key jwk.Key, funcs ...LocalHandlerOp
|
|||||||
}
|
}
|
||||||
|
|
||||||
handler := &LocalHandler{
|
handler := &LocalHandler{
|
||||||
algo: algo,
|
algo: algo,
|
||||||
key: key,
|
key: key,
|
||||||
accounts: toAccountsMap(opts.Accounts),
|
accounts: toAccountsMap(opts.Accounts),
|
||||||
cookieDomain: opts.CookieDomain,
|
getCookieDomain: opts.GetCookieDomain,
|
||||||
cookieDuration: opts.CookieDuration,
|
cookieDuration: opts.CookieDuration,
|
||||||
}
|
}
|
||||||
|
|
||||||
handler.initRouter(opts.RoutePrefix)
|
handler.initRouter(opts.RoutePrefix)
|
||||||
|
@ -1,22 +1,31 @@
|
|||||||
package http
|
package http
|
||||||
|
|
||||||
import "time"
|
import (
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GetCookieDomainFunc func(r *http.Request) (string, error)
|
||||||
|
|
||||||
|
func defaultGetCookieDomain(r *http.Request) (string, error) {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
type LocalHandlerOptions struct {
|
type LocalHandlerOptions struct {
|
||||||
RoutePrefix string
|
RoutePrefix string
|
||||||
Accounts []LocalAccount
|
Accounts []LocalAccount
|
||||||
CookieDomain string
|
GetCookieDomain GetCookieDomainFunc
|
||||||
CookieDuration time.Duration
|
CookieDuration time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
type LocalHandlerOptionFunc func(*LocalHandlerOptions)
|
type LocalHandlerOptionFunc func(*LocalHandlerOptions)
|
||||||
|
|
||||||
func defaultLocalHandlerOptions() *LocalHandlerOptions {
|
func defaultLocalHandlerOptions() *LocalHandlerOptions {
|
||||||
return &LocalHandlerOptions{
|
return &LocalHandlerOptions{
|
||||||
RoutePrefix: "",
|
RoutePrefix: "",
|
||||||
Accounts: make([]LocalAccount, 0),
|
Accounts: make([]LocalAccount, 0),
|
||||||
CookieDomain: "",
|
GetCookieDomain: defaultGetCookieDomain,
|
||||||
CookieDuration: 24 * time.Hour,
|
CookieDuration: 24 * time.Hour,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,9 +41,9 @@ func WithRoutePrefix(prefix string) LocalHandlerOptionFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func WithCookieOptions(domain string, duration time.Duration) LocalHandlerOptionFunc {
|
func WithCookieOptions(getCookieDomain GetCookieDomainFunc, duration time.Duration) LocalHandlerOptionFunc {
|
||||||
return func(opts *LocalHandlerOptions) {
|
return func(opts *LocalHandlerOptions) {
|
||||||
opts.CookieDomain = domain
|
opts.GetCookieDomain = getCookieDomain
|
||||||
opts.CookieDuration = duration
|
opts.CookieDuration = duration
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ func TestBlobModule(t *testing.T) {
|
|||||||
logger.SetLevel(slog.LevelDebug)
|
logger.SetLevel(slog.LevelDebug)
|
||||||
|
|
||||||
bus := memory.NewBus()
|
bus := memory.NewBus()
|
||||||
store := sqlite.NewBlobStore(":memory:")
|
store := sqlite.NewBlobStore(":memory:?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000")
|
||||||
|
|
||||||
server := app.NewServer(
|
server := app.NewServer(
|
||||||
module.ContextModuleFactory(),
|
module.ContextModuleFactory(),
|
||||||
|
@ -39,7 +39,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func getDeviceClientByUUID(ctx context.Context, uuid string) (*cast.Client, error) {
|
func getDeviceClientByUUID(ctx context.Context, uuid string) (*cast.Client, error) {
|
||||||
device, err := findDeviceByUUID(ctx, uuid)
|
device, err := FindDeviceByUUID(ctx, uuid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -49,7 +49,7 @@ func getDeviceClientByUUID(ctx context.Context, uuid string) (*cast.Client, erro
|
|||||||
return client, nil
|
return client, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func findDeviceByUUID(ctx context.Context, uuid string) (*Device, error) {
|
func FindDeviceByUUID(ctx context.Context, uuid string) (*Device, error) {
|
||||||
service := discovery.NewService(ctx)
|
service := discovery.NewService(ctx)
|
||||||
defer service.Stop()
|
defer service.Stop()
|
||||||
|
|
||||||
@ -83,7 +83,7 @@ LOOP:
|
|||||||
return nil, errors.WithStack(ErrDeviceNotFound)
|
return nil, errors.WithStack(ErrDeviceNotFound)
|
||||||
}
|
}
|
||||||
|
|
||||||
func findDevices(ctx context.Context) ([]*Device, error) {
|
func FindDevices(ctx context.Context) ([]*Device, error) {
|
||||||
service := discovery.NewService(ctx)
|
service := discovery.NewService(ctx)
|
||||||
defer service.Stop()
|
defer service.Stop()
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ LOOP:
|
|||||||
return devices, nil
|
return devices, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadURL(ctx context.Context, deviceUUID string, url string) error {
|
func LoadURL(ctx context.Context, deviceUUID string, url string) error {
|
||||||
client, err := getDeviceClientByUUID(ctx, deviceUUID)
|
client, err := getDeviceClientByUUID(ctx, deviceUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
@ -153,7 +153,7 @@ func isLoadURLContextExceeded(err error) bool {
|
|||||||
return err.Error() == "Failed to send load command: context deadline exceeded"
|
return err.Error() == "Failed to send load command: context deadline exceeded"
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopCast(ctx context.Context, deviceUUID string) error {
|
func StopCast(ctx context.Context, deviceUUID string) error {
|
||||||
client, err := getDeviceClientByUUID(ctx, deviceUUID)
|
client, err := getDeviceClientByUUID(ctx, deviceUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
|
@ -26,7 +26,7 @@ func TestCastLoadURL(t *testing.T) {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
devices, err := findDevices(ctx)
|
devices, err := FindDevices(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Error(errors.WithStack(err))
|
t.Error(errors.WithStack(err))
|
||||||
}
|
}
|
||||||
@ -40,7 +40,7 @@ func TestCastLoadURL(t *testing.T) {
|
|||||||
ctx, cancel2 := context.WithTimeout(context.Background(), 15*time.Second)
|
ctx, cancel2 := context.WithTimeout(context.Background(), 15*time.Second)
|
||||||
defer cancel2()
|
defer cancel2()
|
||||||
|
|
||||||
if err := loadURL(ctx, dev.UUID, "https://go.dev"); err != nil {
|
if err := LoadURL(ctx, dev.UUID, "https://go.dev"); err != nil {
|
||||||
t.Error(errors.WithStack(err))
|
t.Error(errors.WithStack(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ func TestCastLoadURL(t *testing.T) {
|
|||||||
ctx, cancel4 := context.WithTimeout(context.Background(), 15*time.Second)
|
ctx, cancel4 := context.WithTimeout(context.Background(), 15*time.Second)
|
||||||
defer cancel4()
|
defer cancel4()
|
||||||
|
|
||||||
if err := stopCast(ctx, dev.UUID); err != nil {
|
if err := StopCast(ctx, dev.UUID); err != nil {
|
||||||
t.Error(errors.WithStack(err))
|
t.Error(errors.WithStack(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ func (m *Module) refreshDevices(call goja.FunctionCall, rt *goja.Runtime) goja.V
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
devices, err := findDevices(ctx)
|
devices, err := FindDevices(ctx)
|
||||||
if err != nil && !errors.Is(err, context.DeadlineExceeded) {
|
if err != nil && !errors.Is(err, context.DeadlineExceeded) {
|
||||||
err = errors.WithStack(err)
|
err = errors.WithStack(err)
|
||||||
logger.Error(ctx, "error refreshing casting devices list", logger.E(errors.WithStack(err)))
|
logger.Error(ctx, "error refreshing casting devices list", logger.E(errors.WithStack(err)))
|
||||||
@ -128,7 +128,7 @@ func (m *Module) loadUrl(call goja.FunctionCall, rt *goja.Runtime) goja.Value {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
err := loadURL(ctx, deviceUUID, url)
|
err := LoadURL(ctx, deviceUUID, url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.WithStack(err)
|
err = errors.WithStack(err)
|
||||||
logger.Error(ctx, "error while casting url", logger.E(err))
|
logger.Error(ctx, "error while casting url", logger.E(err))
|
||||||
@ -166,7 +166,7 @@ func (m *Module) stopCast(call goja.FunctionCall, rt *goja.Runtime) goja.Value {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
err := stopCast(ctx, deviceUUID)
|
err := StopCast(ctx, deviceUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.WithStack(err)
|
err = errors.WithStack(err)
|
||||||
logger.Error(ctx, "error while quitting casting device app", logger.E(errors.WithStack(err)))
|
logger.Error(ctx, "error while quitting casting device app", logger.E(errors.WithStack(err)))
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/url"
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"cdr.dev/slog"
|
"cdr.dev/slog"
|
||||||
"forge.cadoles.com/arcad/edge/pkg/app"
|
"forge.cadoles.com/arcad/edge/pkg/app"
|
||||||
@ -42,7 +43,12 @@ func TestFetchModule(t *testing.T) {
|
|||||||
t.Fatalf("%+v", errors.WithStack(err))
|
t.Fatalf("%+v", errors.WithStack(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
// Wait for module to startup
|
||||||
|
time.Sleep(1 * time.Second)
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
remoteAddr := "127.0.0.1"
|
remoteAddr := "127.0.0.1"
|
||||||
url, _ := url.Parse("http://example.com")
|
url, _ := url.Parse("http://example.com")
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ import (
|
|||||||
func TestStoreModule(t *testing.T) {
|
func TestStoreModule(t *testing.T) {
|
||||||
logger.SetLevel(logger.LevelDebug)
|
logger.SetLevel(logger.LevelDebug)
|
||||||
|
|
||||||
store := sqlite.NewDocumentStore(":memory:")
|
store := sqlite.NewDocumentStore(":memory:?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000")
|
||||||
server := app.NewServer(
|
server := app.NewServer(
|
||||||
module.ContextModuleFactory(),
|
module.ContextModuleFactory(),
|
||||||
module.ConsoleModuleFactory(),
|
module.ConsoleModuleFactory(),
|
||||||
|
78
pkg/sdk/client/dist/client.js
vendored
78
pkg/sdk/client/dist/client.js
vendored
@ -3785,7 +3785,8 @@ var Edge = (() => {
|
|||||||
// pkg/sdk/client/src/index.ts
|
// pkg/sdk/client/src/index.ts
|
||||||
var src_exports = {};
|
var src_exports = {};
|
||||||
__export(src_exports, {
|
__export(src_exports, {
|
||||||
default: () => src_default
|
client: () => client,
|
||||||
|
crossFrameMessenger: () => crossFrameMessenger
|
||||||
});
|
});
|
||||||
|
|
||||||
// pkg/sdk/client/src/event-target.ts
|
// pkg/sdk/client/src/event-target.ts
|
||||||
@ -4089,9 +4090,80 @@ var Edge = (() => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// pkg/sdk/client/src/crossframe-messenger.ts
|
||||||
|
var CrossFrameMessenger = class extends EventTarget {
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
this.debug = false;
|
||||||
|
this._handleWindowMessage = this._handleWindowMessage.bind(this);
|
||||||
|
this._initObservers = this._initObservers.bind(this);
|
||||||
|
window.addEventListener("load", this._initObservers);
|
||||||
|
window.addEventListener("message", this._handleWindowMessage);
|
||||||
|
}
|
||||||
|
post(message, target = window.parent) {
|
||||||
|
if (!target)
|
||||||
|
return;
|
||||||
|
this._log("sending crossframe message", message);
|
||||||
|
target.postMessage(message);
|
||||||
|
}
|
||||||
|
_log(...args) {
|
||||||
|
if (!this.debug)
|
||||||
|
return;
|
||||||
|
console.log(...args);
|
||||||
|
}
|
||||||
|
_handleWindowMessage(evt) {
|
||||||
|
const message = evt.data;
|
||||||
|
const event = new CustomEvent(message.type, {
|
||||||
|
cancelable: true,
|
||||||
|
detail: message.data
|
||||||
|
});
|
||||||
|
this.dispatchEvent(event);
|
||||||
|
}
|
||||||
|
_initObservers() {
|
||||||
|
this._initResizeObserver();
|
||||||
|
this._initTitleMutationObserver();
|
||||||
|
}
|
||||||
|
_initTitleMutationObserver() {
|
||||||
|
const titleObserver = new MutationObserver((mutations) => {
|
||||||
|
const title2 = mutations[0].target.textContent;
|
||||||
|
this.post({ type: "title_changed" /* TITLE_CHANGED */, data: { title: title2 } });
|
||||||
|
});
|
||||||
|
const title = document.querySelector("title");
|
||||||
|
if (!title)
|
||||||
|
return;
|
||||||
|
this.post({ type: "title_changed" /* TITLE_CHANGED */, data: { title: title.textContent } });
|
||||||
|
titleObserver.observe(title, { subtree: true, characterData: true, childList: true });
|
||||||
|
}
|
||||||
|
_initResizeObserver() {
|
||||||
|
const resizeObserver = new ResizeObserver(() => {
|
||||||
|
const body2 = document.body, html = document.documentElement;
|
||||||
|
const height = Math.max(
|
||||||
|
body2.scrollHeight,
|
||||||
|
body2.offsetHeight,
|
||||||
|
html.clientHeight,
|
||||||
|
html.scrollHeight,
|
||||||
|
html.offsetHeight
|
||||||
|
);
|
||||||
|
const width = Math.max(
|
||||||
|
body2.scrollWidth,
|
||||||
|
body2.offsetWidth,
|
||||||
|
html.clientWidth,
|
||||||
|
html.scrollWidth,
|
||||||
|
html.offsetWidth
|
||||||
|
);
|
||||||
|
this.post({ type: "size_changed" /* SIZE_CHANGED */, data: { height, width } });
|
||||||
|
});
|
||||||
|
const body = document.body;
|
||||||
|
if (!body)
|
||||||
|
return;
|
||||||
|
resizeObserver.observe(body);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// pkg/sdk/client/src/index.ts
|
// pkg/sdk/client/src/index.ts
|
||||||
var src_default = new Client();
|
var client = new Client();
|
||||||
|
var crossFrameMessenger = new CrossFrameMessenger();
|
||||||
return __toCommonJS(src_exports);
|
return __toCommonJS(src_exports);
|
||||||
})();
|
})();
|
||||||
Edge=Edge.default;
|
EdgeFrame=Edge.crossFrameMessenger;Edge=Edge.client
|
||||||
//# sourceMappingURL=client.js.map
|
//# sourceMappingURL=client.js.map
|
||||||
|
8
pkg/sdk/client/dist/client.js.map
vendored
8
pkg/sdk/client/dist/client.js.map
vendored
File diff suppressed because one or more lines are too long
@ -19,15 +19,16 @@ export class Client extends EventTarget {
|
|||||||
constructor(autoReconnect = true) {
|
constructor(autoReconnect = true) {
|
||||||
super();
|
super();
|
||||||
this._conn = null;
|
this._conn = null;
|
||||||
|
|
||||||
this._onConnectionClose = this._onConnectionClose.bind(this);
|
this._onConnectionClose = this._onConnectionClose.bind(this);
|
||||||
this._onConnectionMessage = this._onConnectionMessage.bind(this);
|
this._onConnectionMessage = this._onConnectionMessage.bind(this);
|
||||||
this._handleRPCResponse = this._handleRPCResponse.bind(this);
|
this._handleRPCResponse = this._handleRPCResponse.bind(this);
|
||||||
|
|
||||||
this._rpcID = 0;
|
this._rpcID = 0;
|
||||||
this._pendingRPC = {};
|
this._pendingRPC = {};
|
||||||
this._queue = [];
|
this._queue = [];
|
||||||
this._reconnectionDelay = 250;
|
this._reconnectionDelay = 250;
|
||||||
this._autoReconnect = autoReconnect;
|
this._autoReconnect = autoReconnect;
|
||||||
|
|
||||||
this.debug = false;
|
this.debug = false;
|
||||||
|
|
||||||
this.connect = this.connect.bind(this);
|
this.connect = this.connect.bind(this);
|
||||||
|
88
pkg/sdk/client/src/crossframe-messenger.ts
Normal file
88
pkg/sdk/client/src/crossframe-messenger.ts
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
import { EventTarget } from "./event-target";
|
||||||
|
|
||||||
|
enum CrossFrameMessageType {
|
||||||
|
SIZE_CHANGED = "size_changed",
|
||||||
|
TITLE_CHANGED = "title_changed"
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CrossFrameMessage {
|
||||||
|
type: CrossFrameMessageType
|
||||||
|
data: { [key: string]: any }
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CrossFrameMessenger extends EventTarget {
|
||||||
|
debug: boolean;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super()
|
||||||
|
this.debug = false;
|
||||||
|
|
||||||
|
this._handleWindowMessage = this._handleWindowMessage.bind(this);
|
||||||
|
this._initObservers = this._initObservers.bind(this);
|
||||||
|
|
||||||
|
window.addEventListener('load', this._initObservers);
|
||||||
|
window.addEventListener('message', this._handleWindowMessage)
|
||||||
|
}
|
||||||
|
|
||||||
|
post(message: CrossFrameMessage, target: Window = window.parent) {
|
||||||
|
if (!target) return;
|
||||||
|
this._log("sending crossframe message", message);
|
||||||
|
target.postMessage(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
_log(...args) {
|
||||||
|
if (!this.debug) return;
|
||||||
|
console.log(...args);
|
||||||
|
}
|
||||||
|
|
||||||
|
_handleWindowMessage(evt: MessageEvent) {
|
||||||
|
const message = evt.data;
|
||||||
|
const event = new CustomEvent(message.type, {
|
||||||
|
cancelable: true,
|
||||||
|
detail: message.data
|
||||||
|
});
|
||||||
|
|
||||||
|
this.dispatchEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
_initObservers() {
|
||||||
|
this._initResizeObserver();
|
||||||
|
this._initTitleMutationObserver();
|
||||||
|
}
|
||||||
|
|
||||||
|
_initTitleMutationObserver() {
|
||||||
|
const titleObserver = new MutationObserver((mutations) => {
|
||||||
|
const title = mutations[0].target.textContent;
|
||||||
|
this.post({ type: CrossFrameMessageType.TITLE_CHANGED, data: { title }});
|
||||||
|
});
|
||||||
|
|
||||||
|
const title = document.querySelector('title');
|
||||||
|
|
||||||
|
if (!title) return;
|
||||||
|
|
||||||
|
this.post({ type: CrossFrameMessageType.TITLE_CHANGED, data: { title: title.textContent }});
|
||||||
|
|
||||||
|
titleObserver.observe(title, { subtree: true, characterData: true, childList: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
_initResizeObserver() {
|
||||||
|
const resizeObserver = new ResizeObserver(() => {
|
||||||
|
const body = document.body,
|
||||||
|
html = document.documentElement;
|
||||||
|
|
||||||
|
const height = Math.max( body.scrollHeight, body.offsetHeight,
|
||||||
|
html.clientHeight, html.scrollHeight, html.offsetHeight );
|
||||||
|
|
||||||
|
const width = Math.max( body.scrollWidth, body.offsetWidth,
|
||||||
|
html.clientWidth, html.scrollWidth, html.offsetWidth );
|
||||||
|
|
||||||
|
this.post({ type: CrossFrameMessageType.SIZE_CHANGED, data: { height, width }});
|
||||||
|
});
|
||||||
|
|
||||||
|
const body = document.body;
|
||||||
|
|
||||||
|
if (!body) return;
|
||||||
|
|
||||||
|
resizeObserver.observe(body);
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +1,5 @@
|
|||||||
import { Client } from './client.js';
|
import { Client } from './client.js';
|
||||||
|
import { CrossFrameMessenger } from './crossframe-messenger.js';
|
||||||
|
|
||||||
export default new Client();
|
export const client = new Client();
|
||||||
|
export const crossFrameMessenger = new CrossFrameMessenger();
|
@ -35,6 +35,10 @@ func (b *BlobBucket) Size(ctx context.Context) (int64, error) {
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := row.Err(); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
size = nullSize.Int64
|
size = nullSize.Int64
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@ -111,6 +115,10 @@ func (b *BlobBucket) Get(ctx context.Context, id storage.BlobID) (storage.BlobIn
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := row.Err(); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
blobInfo = &BlobInfo{
|
blobInfo = &BlobInfo{
|
||||||
id: id,
|
id: id,
|
||||||
bucket: b.name,
|
bucket: b.name,
|
||||||
@ -143,6 +151,12 @@ func (b *BlobBucket) List(ctx context.Context) ([]storage.BlobInfo, error) {
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
logger.Error(ctx, "could not close rows", logger.E(errors.WithStack(err)))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
blobs = make([]storage.BlobInfo, 0)
|
blobs = make([]storage.BlobInfo, 0)
|
||||||
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
package sqlite
|
package sqlite
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/arcad/edge/pkg/storage/testsuite"
|
"forge.cadoles.com/arcad/edge/pkg/storage/testsuite"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@ -19,7 +21,8 @@ func TestBlobStore(t *testing.T) {
|
|||||||
t.Fatalf("%+v", errors.WithStack(err))
|
t.Fatalf("%+v", errors.WithStack(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
store := NewBlobStore(file)
|
dsn := fmt.Sprintf("%s?_pragma=foreign_keys(1)&_pragma=busy_timeout=%d", file, (60 * time.Second).Milliseconds())
|
||||||
|
store := NewBlobStore(dsn)
|
||||||
|
|
||||||
testsuite.TestBlobStore(t, store)
|
testsuite.TestBlobStore(t, store)
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/arcad/edge/pkg/storage"
|
"forge.cadoles.com/arcad/edge/pkg/storage"
|
||||||
@ -18,10 +17,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type DocumentStore struct {
|
type DocumentStore struct {
|
||||||
db *sql.DB
|
getDB getDBFunc
|
||||||
path string
|
|
||||||
openOnce sync.Once
|
|
||||||
mutex sync.RWMutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete implements storage.DocumentStore
|
// Delete implements storage.DocumentStore
|
||||||
@ -74,6 +70,10 @@ func (s *DocumentStore) Get(ctx context.Context, collection string, id storage.D
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := row.Err(); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
document = storage.Document(data)
|
document = storage.Document(data)
|
||||||
|
|
||||||
document[storage.DocumentAttrID] = id
|
document[storage.DocumentAttrID] = id
|
||||||
@ -160,7 +160,11 @@ func (s *DocumentStore) Query(ctx context.Context, collection string, filter *fi
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
defer rows.Close()
|
defer func() {
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
logger.Error(ctx, "could not close rows", logger.E(errors.WithStack(err)))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
documents = make([]storage.Document, 0)
|
documents = make([]storage.Document, 0)
|
||||||
|
|
||||||
@ -238,6 +242,10 @@ func (s *DocumentStore) Upsert(ctx context.Context, collection string, document
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := row.Err(); err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
upsertedDocument = storage.Document(data)
|
upsertedDocument = storage.Document(data)
|
||||||
|
|
||||||
upsertedDocument[storage.DocumentAttrID] = id
|
upsertedDocument[storage.DocumentAttrID] = id
|
||||||
@ -256,7 +264,7 @@ func (s *DocumentStore) Upsert(ctx context.Context, collection string, document
|
|||||||
func (s *DocumentStore) withTx(ctx context.Context, fn func(tx *sql.Tx) error) error {
|
func (s *DocumentStore) withTx(ctx context.Context, fn func(tx *sql.Tx) error) error {
|
||||||
var db *sql.DB
|
var db *sql.DB
|
||||||
|
|
||||||
db, err := s.getDatabase(ctx)
|
db, err := s.getDB(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -268,67 +276,7 @@ func (s *DocumentStore) withTx(ctx context.Context, fn func(tx *sql.Tx) error) e
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DocumentStore) getDatabase(ctx context.Context) (*sql.DB, error) {
|
func ensureTables(ctx context.Context, db *sql.DB) error {
|
||||||
s.mutex.RLock()
|
|
||||||
if s.db != nil {
|
|
||||||
defer s.mutex.RUnlock()
|
|
||||||
|
|
||||||
var err error
|
|
||||||
|
|
||||||
s.openOnce.Do(func() {
|
|
||||||
if err = s.ensureTables(ctx, s.db); err != nil {
|
|
||||||
err = errors.WithStack(err)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return s.db, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
s.mutex.RUnlock()
|
|
||||||
|
|
||||||
var (
|
|
||||||
db *sql.DB
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
|
|
||||||
s.openOnce.Do(func() {
|
|
||||||
db, err = sql.Open("sqlite", s.path)
|
|
||||||
if err != nil {
|
|
||||||
err = errors.WithStack(err)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = s.ensureTables(ctx, db); err != nil {
|
|
||||||
err = errors.WithStack(err)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if db != nil {
|
|
||||||
s.mutex.Lock()
|
|
||||||
s.db = db
|
|
||||||
s.mutex.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
s.mutex.RLock()
|
|
||||||
defer s.mutex.RUnlock()
|
|
||||||
|
|
||||||
return s.db, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *DocumentStore) ensureTables(ctx context.Context, db *sql.DB) error {
|
|
||||||
err := withTx(ctx, db, func(tx *sql.Tx) error {
|
err := withTx(ctx, db, func(tx *sql.Tx) error {
|
||||||
query := `
|
query := `
|
||||||
CREATE TABLE IF NOT EXISTS documents (
|
CREATE TABLE IF NOT EXISTS documents (
|
||||||
@ -396,18 +344,18 @@ func withLimitOffsetClause(query string, args []any, limit int, offset int) (str
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewDocumentStore(path string) *DocumentStore {
|
func NewDocumentStore(path string) *DocumentStore {
|
||||||
|
getDB := newGetDBFunc(path, ensureTables)
|
||||||
|
|
||||||
return &DocumentStore{
|
return &DocumentStore{
|
||||||
db: nil,
|
getDB: getDB,
|
||||||
path: path,
|
|
||||||
openOnce: sync.Once{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDocumentStoreWithDB(db *sql.DB) *DocumentStore {
|
func NewDocumentStoreWithDB(db *sql.DB) *DocumentStore {
|
||||||
|
getDB := newGetDBFuncFromDB(db, ensureTables)
|
||||||
|
|
||||||
return &DocumentStore{
|
return &DocumentStore{
|
||||||
db: db,
|
getDB: getDB,
|
||||||
path: "",
|
|
||||||
openOnce: sync.Once{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
package sqlite
|
package sqlite
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/arcad/edge/pkg/storage/testsuite"
|
"forge.cadoles.com/arcad/edge/pkg/storage/testsuite"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@ -10,7 +12,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestDocumentStore(t *testing.T) {
|
func TestDocumentStore(t *testing.T) {
|
||||||
// t.Parallel()
|
t.Parallel()
|
||||||
logger.SetLevel(logger.LevelDebug)
|
logger.SetLevel(logger.LevelDebug)
|
||||||
|
|
||||||
file := "./testdata/documentstore_test.sqlite"
|
file := "./testdata/documentstore_test.sqlite"
|
||||||
@ -19,7 +21,8 @@ func TestDocumentStore(t *testing.T) {
|
|||||||
t.Fatalf("%+v", errors.WithStack(err))
|
t.Fatalf("%+v", errors.WithStack(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
store := NewDocumentStore(file)
|
dsn := fmt.Sprintf("%s?_pragma=foreign_keys(1)&_pragma=busy_timeout=%d", file, (60 * time.Second).Milliseconds())
|
||||||
|
store := NewDocumentStore(dsn)
|
||||||
|
|
||||||
testsuite.TestDocumentStore(t, store)
|
testsuite.TestDocumentStore(t, store)
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,9 @@ import (
|
|||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gitlab.com/wpetit/goweb/logger"
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
|
|
||||||
|
"modernc.org/sqlite"
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
|
sqlite3 "modernc.org/sqlite/lib"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Open(path string) (*sql.DB, error) {
|
func Open(path string) (*sql.DB, error) {
|
||||||
@ -38,8 +40,27 @@ func withTx(ctx context.Context, db *sql.DB, fn func(tx *sql.Tx) error) error {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if err = fn(tx); err != nil {
|
for {
|
||||||
return errors.WithStack(err)
|
if err = fn(tx); err != nil {
|
||||||
|
var sqlErr *sqlite.Error
|
||||||
|
if errors.As(err, &sqlErr) {
|
||||||
|
if sqlErr.Code() == sqlite3.SQLITE_BUSY {
|
||||||
|
logger.Warn(ctx, "database busy, retrying transaction")
|
||||||
|
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
logger.Error(ctx, "could not execute transaction", logger.E(errors.WithStack(err)))
|
||||||
|
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = tx.Commit(); err != nil {
|
if err = tx.Commit(); err != nil {
|
||||||
|
2
pkg/storage/sqlite/testdata/.gitignore
vendored
2
pkg/storage/sqlite/testdata/.gitignore
vendored
@ -1 +1 @@
|
|||||||
/*.sqlite
|
/*.sqlite*
|
@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
func TestBlobStore(t *testing.T, store storage.BlobStore) {
|
func TestBlobStore(t *testing.T, store storage.BlobStore) {
|
||||||
t.Run("Ops", func(t *testing.T) {
|
t.Run("Ops", func(t *testing.T) {
|
||||||
// t.Parallel()
|
t.Parallel()
|
||||||
testBlobStoreOps(t, store)
|
testBlobStoreOps(t, store)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
func TestDocumentStore(t *testing.T, store storage.DocumentStore) {
|
func TestDocumentStore(t *testing.T, store storage.DocumentStore) {
|
||||||
t.Run("Ops", func(t *testing.T) {
|
t.Run("Ops", func(t *testing.T) {
|
||||||
// t.Parallel()
|
t.Parallel()
|
||||||
testDocumentStoreOps(t, store)
|
testDocumentStoreOps(t, store)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -437,6 +437,7 @@ func testDocumentStoreOps(t *testing.T, store storage.DocumentStore) {
|
|||||||
for _, tc := range documentStoreOpsTestCases {
|
for _, tc := range documentStoreOpsTestCases {
|
||||||
func(tc documentStoreOpsTestCase) {
|
func(tc documentStoreOpsTestCase) {
|
||||||
t.Run(tc.Name, func(t *testing.T) {
|
t.Run(tc.Name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
if err := tc.Run(context.Background(), store); err != nil {
|
if err := tc.Run(context.Background(), store); err != nil {
|
||||||
t.Errorf("%+v", errors.WithStack(err))
|
t.Errorf("%+v", errors.WithStack(err))
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user