Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: autosync
Title: 'Automerge' Sync Server and Client
Version: 0.0.1.9000
Version: 0.1.0
Authors@R: c(
person("Charlie", "Gao", , "charlie.gao@posit.co", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-0750-061X")),
Expand Down Expand Up @@ -33,6 +33,6 @@ Suggests:
testthat (>= 3.0.0)
Config/Needs/website: tidyverse/tidytemplate
Config/roxygen2/markdown: TRUE
Config/roxygen2/version: 8.0.0
Config/roxygen2/version: 8.0.0.9000
Config/testthat/edition: 3
Encoding: UTF-8
94 changes: 53 additions & 41 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,58 @@ export(sync_client)
export(sync_fetch)
export(sync_server)
export(sync_token)
importFrom(automerge,AM_ROOT)
importFrom(automerge,am_create)
importFrom(automerge,am_get)
importFrom(automerge,am_keys)
importFrom(automerge,am_length)
importFrom(automerge,am_load)
importFrom(automerge,am_save)
importFrom(automerge,am_sync_decode)
importFrom(automerge,am_sync_encode)
importFrom(automerge,am_sync_state)
importFrom(automerge,am_sync_state_decode)
importFrom(automerge,am_sync_state_encode)
importFrom(httr2,oauth_client)
importFrom(httr2,oauth_flow_auth_code)
importFrom(httr2,oauth_redirect_uri)
importFrom(httr2,oauth_server_metadata)
importFrom(jose,jwt_decode_sig)
importFrom(jose,read_jwk)
importFrom(later,later)
importFrom(later,run_now)
importFrom(nanonext,handler_ws)
importFrom(nanonext,http_server)
importFrom(nanonext,is_error_value)
importFrom(nanonext,ncurl)
importFrom(nanonext,random)
importFrom(nanonext,recv)
importFrom(nanonext,recv_aio)
importFrom(nanonext,send)
importFrom(nanonext,stop_aio)
importFrom(nanonext,stream)
importFrom(nanonext,tls_config)
importFrom(nanonext,unresolved)
importFrom(nanonext,write_cert)
importFrom(automerge,
AM_ROOT,
am_create,
am_get,
am_keys,
am_length,
am_load,
am_save,
am_sync_decode,
am_sync_encode,
am_sync_state,
am_sync_state_decode,
am_sync_state_encode
)
importFrom(httr2,
oauth_client,
oauth_flow_auth_code,
oauth_redirect_uri,
oauth_server_metadata
)
importFrom(jose,
jwt_decode_sig,
read_jwk
)
importFrom(later,
later,
run_now
)
importFrom(nanonext,
handler_ws,
http_server,
is_error_value,
ncurl,
random,
recv,
recv_aio,
send,
stop_aio,
stream,
tls_config,
unresolved,
write_cert
)
importFrom(promises,then)
importFrom(secretbase,base58dec)
importFrom(secretbase,base58enc)
importFrom(secretbase,base64dec)
importFrom(secretbase,base64enc)
importFrom(secretbase,cbordec)
importFrom(secretbase,cborenc)
importFrom(secretbase,jsondec)
importFrom(secretbase,jsonenc)
importFrom(secretbase,
base58dec,
base58enc,
base64dec,
base64enc,
cbordec,
cborenc,
jsondec,
jsonenc
)
importFrom(utils,str)
6 changes: 1 addition & 5 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# autosync (development version)
# autosync 0.1.0

* Initial CRAN release.

# autosync 0.0.1

* Initial version.
13 changes: 9 additions & 4 deletions R/autosync-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@
#' @name autosync-package
#' @aliases autosync
#'
#' @importFrom automerge am_create am_get am_keys am_length am_load am_save am_sync_decode am_sync_encode am_sync_state am_sync_state_decode am_sync_state_encode AM_ROOT
#' @importFrom httr2 oauth_client oauth_flow_auth_code oauth_redirect_uri oauth_server_metadata
#' @importFrom automerge am_create am_get am_keys am_length am_load am_save
#' am_sync_decode am_sync_encode am_sync_state am_sync_state_decode
#' am_sync_state_encode AM_ROOT
#' @importFrom httr2 oauth_client oauth_flow_auth_code oauth_redirect_uri
#' oauth_server_metadata
#' @importFrom jose jwt_decode_sig read_jwk
#' @importFrom later later run_now
#' @importFrom nanonext handler_ws http_server is_error_value ncurl random recv recv_aio send stop_aio stream tls_config unresolved write_cert
#' @importFrom nanonext handler_ws http_server is_error_value ncurl random recv
#' recv_aio send stop_aio stream tls_config unresolved write_cert
#' @importFrom promises then
#' @importFrom secretbase base64enc base64dec base58enc base58dec cborenc cbordec jsondec jsonenc
#' @importFrom secretbase base64enc base64dec base58enc base58dec cborenc
#' cbordec jsondec jsonenc
#' @importFrom utils str
"_PACKAGE"
6 changes: 4 additions & 2 deletions R/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#' @param port Port to listen on. Default 0 (binds to a random available port).
#' The actual URL is retrieved via `server$url`.
#' @param host Host address to bind to. Default "127.0.0.1" (localhost).
#' @param data_dir Directory for persistent document storage. Default ".automerge".
#' @param data_dir Directory for document storage. Defaults to a
#' session-temporary directory, so documents do not persist across R
#' sessions. Supply an explicit path to persist documents across sessions.
#' @param auto_create_docs Logical, whether to auto-create documents when
#' clients request unknown document IDs. Default TRUE.
#' @param storage_id Optional storage ID for this server. If NULL (default),
Expand Down Expand Up @@ -77,7 +79,7 @@
sync_server <- function(
port = 0L,
host = "127.0.0.1",
data_dir = ".automerge",
data_dir = tempfile("autosync"),
auto_create_docs = TRUE,
storage_id = NULL,
tls = NULL,
Expand Down
27 changes: 23 additions & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,27 @@

* This is a new release.

## Method references
## Re-submission Responses

There are no published references describing the methods in this package. It
implements the publicly documented 'automerge-repo' WebSocket synchronization
protocol (<https://automerge.org/>).
If there are references describing the methods in your package, please
add these in the description field of your DESCRIPTION file in the form
authors (year) <doi:...>
authors (year, ISBN:...)
or if those are not available: <https:...>
with no space after 'doi:', 'https:' and angle brackets for
auto-linking. (If you want to add a title as well please put it in
quotes: "Title")
For more details:
<https://contributor.r-project.org/cran-cookbook/description_issues.html#references>

There are no published references describing the methods in this package.

Please ensure that your functions do not write by default or in your
examples/vignettes/tests in the user's home filespace (including the
package directory and getwd()). This is not allowed by CRAN policies.
Please omit any default path in writing functions. In your
examples/vignettes/tests you can write to tempdir().
For more details:
<https://contributor.r-project.org/cran-cookbook/code_issues.html#writing-files-and-directories-to-the-home-filespace>

The default `data_dir` parameter to the `sync_server()` function now points to a temp file and not `getwd()`.
6 changes: 4 additions & 2 deletions man/sync_server.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading