2021-02-02 12:05:47 +01:00
|
|
|
// Package oonimkall implements APIs used by OONI mobile apps. We
|
|
|
|
// expose these APIs to mobile apps using gomobile.
|
|
|
|
//
|
|
|
|
// We expose two APIs: the task API, which is derived from the
|
|
|
|
// API originally exposed by Measurement Kit, and the session API,
|
|
|
|
// which is a Go API that mobile apps can use via `gomobile`.
|
|
|
|
//
|
|
|
|
// This package is named oonimkall because it contains a partial
|
|
|
|
// reimplementation of the mkall API implemented by Measurement Kit
|
|
|
|
// in, e.g., https://github.com/measurement-kit/mkall-ios.
|
|
|
|
//
|
|
|
|
// Task API
|
|
|
|
//
|
|
|
|
// The basic tenet of the task API is that you define an experiment
|
|
|
|
// task you wanna run using a JSON, then you start a task for it, and
|
|
|
|
// you receive events as serialized JSONs. In addition to this
|
|
|
|
// functionality, we also include extra APIs used by OONI mobile.
|
|
|
|
//
|
|
|
|
// The task API was first defined in Measurement Kit v0.9.0. In this
|
|
|
|
// context, it was called "the FFI API". The API we expose here is not
|
|
|
|
// strictly an FFI API, but is close enough for the purpose of using
|
|
|
|
// OONI from Android and iOS. See https://git.io/Jv4Rv
|
|
|
|
// (measurement-kit/measurement-kit@v0.10.9) for a comprehensive
|
|
|
|
// description of MK's FFI API.
|
|
|
|
//
|
|
|
|
// See also https://github.com/ooni/probe-cli/v3/internal/engine/pull/347 for the
|
|
|
|
// design document describing the task API.
|
|
|
|
//
|
|
|
|
// See also https://github.com/ooni/probe-cli/v3/internal/engine/blob/master/DESIGN.md,
|
|
|
|
// which explains why we implemented the oonimkall API.
|
|
|
|
//
|
|
|
|
// Session API
|
|
|
|
//
|
|
|
|
// The Session API is a Go API that can be exported to mobile apps
|
|
|
|
// using the gomobile tool. The latest design document for this API is
|
|
|
|
// at https://github.com/ooni/probe-cli/v3/internal/engine/pull/954.
|
|
|
|
//
|
|
|
|
// The basic tenet of the session API is that you create an instance
|
|
|
|
// of `Session` and use it to perform the operations you need.
|
|
|
|
package oonimkall
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"encoding/json"
|
|
|
|
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/atomicx"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/runtimex"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
// Task is an asynchronous task running an experiment. It mimics the
|
|
|
|
// namesake concept initially implemented in Measurement Kit.
|
|
|
|
//
|
|
|
|
// Future directions
|
|
|
|
//
|
|
|
|
// Currently Task and Session are two unrelated APIs. As part of
|
|
|
|
// evolving the APIs with which apps interact with the engine, we
|
|
|
|
// will modify Task to run in the context of a Session. We will
|
|
|
|
// do that to save extra lookups and to allow several experiments
|
|
|
|
// running as subsequent Tasks to reuse the Session connections
|
|
|
|
// created with the OONI probe services backends.
|
|
|
|
type Task struct {
|
2021-12-01 15:40:25 +01:00
|
|
|
cancel context.CancelFunc
|
|
|
|
isdone *atomicx.Int64
|
|
|
|
isstarted chan interface{} // for testing
|
|
|
|
isstopped chan interface{} // for testing
|
|
|
|
out chan *event
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// StartTask starts an asynchronous task. The input argument is a
|
|
|
|
// serialized JSON conforming to MK v0.10.9's API.
|
|
|
|
func StartTask(input string) (*Task, error) {
|
2021-11-26 20:21:42 +01:00
|
|
|
var settings settings
|
2021-02-02 12:05:47 +01:00
|
|
|
if err := json.Unmarshal([]byte(input), &settings); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
const bufsiz = 128 // common case: we don't want runner to block
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
task := &Task{
|
2021-12-01 15:40:25 +01:00
|
|
|
cancel: cancel,
|
|
|
|
isdone: &atomicx.Int64{},
|
|
|
|
isstarted: make(chan interface{}),
|
|
|
|
isstopped: make(chan interface{}),
|
|
|
|
out: make(chan *event, bufsiz),
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
go func() {
|
2021-12-01 15:40:25 +01:00
|
|
|
close(task.isstarted)
|
2021-11-26 20:21:42 +01:00
|
|
|
run(ctx, &settings, task.out)
|
[forwardport] fix(oonimkall): don't close channel to signal end of task (#619) (#620)
This diff forward ports 90bf0629b957c912a5a6f3bb6c98ad3abb5a2ff6 to `master`.
If we close the channel to signal the end of a task we may panic
when some background goroutine tries to post on the channel.
This bug is rare but may happen.
See for example https://github.com/ooni/probe/issues/1438.
How can we improve?
First, let us add a timeout when sending to the channel. Given that
the channel is buffered and we have a generous timeout (1/4 of a
second), it's unlikely we will really block. But, in the event in
which a late message appears, we'll eventually _unblock_ when
sending with a timeout. So, now we don't have to worry anymore
about leaking forever a goroutine.
Then, let us change the protocol with which we signal that a task
is done. We used to close the channel. Now, instead we just
synchronously post a nil on the channel when done.
In turn, we interpret this nil to mean that the task is done when
we receive messages.
The _main_ different with respect to before is that now we are
asking the consumer of our API to drain the channel. Because
before we had a blocking channel, it seems to me we were already
requiring the consumer of the API to do that. Which means, I think
in practical terms it did not change much.
Finally, acknowledge that we don't need a specific state variable
to tell us we're done and simplify a little bit the API by
just making isRunning private and using the "we're done" signal
to determine whether we've stopped running the task.
All these changes should be enough to close https://github.com/ooni/probe/issues/1438.
2021-11-26 22:18:45 +01:00
|
|
|
task.out <- nil // signal that we're done w/o closing the channel
|
2021-12-01 15:40:25 +01:00
|
|
|
close(task.isstopped)
|
2021-02-02 12:05:47 +01:00
|
|
|
}()
|
|
|
|
return task, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// WaitForNextEvent blocks until the next event occurs. The returned
|
|
|
|
// string is a serialized JSON following MK v0.10.9's API.
|
|
|
|
func (t *Task) WaitForNextEvent() string {
|
|
|
|
const terminated = `{"key":"task_terminated","value":{}}` // like MK
|
[forwardport] fix(oonimkall): don't close channel to signal end of task (#619) (#620)
This diff forward ports 90bf0629b957c912a5a6f3bb6c98ad3abb5a2ff6 to `master`.
If we close the channel to signal the end of a task we may panic
when some background goroutine tries to post on the channel.
This bug is rare but may happen.
See for example https://github.com/ooni/probe/issues/1438.
How can we improve?
First, let us add a timeout when sending to the channel. Given that
the channel is buffered and we have a generous timeout (1/4 of a
second), it's unlikely we will really block. But, in the event in
which a late message appears, we'll eventually _unblock_ when
sending with a timeout. So, now we don't have to worry anymore
about leaking forever a goroutine.
Then, let us change the protocol with which we signal that a task
is done. We used to close the channel. Now, instead we just
synchronously post a nil on the channel when done.
In turn, we interpret this nil to mean that the task is done when
we receive messages.
The _main_ different with respect to before is that now we are
asking the consumer of our API to drain the channel. Because
before we had a blocking channel, it seems to me we were already
requiring the consumer of the API to do that. Which means, I think
in practical terms it did not change much.
Finally, acknowledge that we don't need a specific state variable
to tell us we're done and simplify a little bit the API by
just making isRunning private and using the "we're done" signal
to determine whether we've stopped running the task.
All these changes should be enough to close https://github.com/ooni/probe/issues/1438.
2021-11-26 22:18:45 +01:00
|
|
|
if t.isdone.Load() != 0 {
|
|
|
|
return terminated
|
|
|
|
}
|
2021-02-02 12:05:47 +01:00
|
|
|
evp := <-t.out
|
|
|
|
if evp == nil {
|
|
|
|
t.isdone.Add(1)
|
|
|
|
return terminated
|
|
|
|
}
|
|
|
|
data, err := json.Marshal(evp)
|
|
|
|
runtimex.PanicOnError(err, "json.Marshal failed")
|
|
|
|
return string(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsDone returns true if the task is done.
|
|
|
|
func (t *Task) IsDone() bool {
|
|
|
|
return t.isdone.Load() != 0
|
|
|
|
}
|
|
|
|
|
|
|
|
// Interrupt interrupts the task.
|
|
|
|
func (t *Task) Interrupt() {
|
|
|
|
t.cancel()
|
|
|
|
}
|