@logux/server 0.12.3 → 0.12.5

package/README.md

@@ -1,17 +1,16 @@
 # Logux Server [![Cult Of Martians][cult-img]][cult]
 
 <img align="right" width="95" height="148" title="Logux logotype"
-     src="https://logux.io/branding/logotype.svg">
+     src="https://logux.org/branding/logotype.svg">
 
 Logux is a new way to connect client and server. Instead of sending
 HTTP requests (e.g., AJAX and GraphQL) it synchronizes log of operations
 between client, server, and other clients.
 
-* **[Guide, recipes, and API](https://logux.io/)**
-* **[Chat](https://gitter.im/logux/logux)** for any questions
+* **[Guide, recipes, and API](https://logux.org/)**
 * **[Issues](https://github.com/logux/logux/issues)**
   and **[roadmap](https://github.com/orgs/logux/projects/1)**
-* **[Projects](https://logux.io/guide/architecture/parts/)**
+* **[Projects](https://logux.org/guide/architecture/parts/)**
   inside Logux ecosystem
 
 This repository contains Logux server with:
@@ -24,7 +23,6 @@ This repository contains Logux server with:
        alt="Sponsored by Evil Martians" width="236" height="54">
 </a>
 
-[logux.io]: https://logux.io/
 [cult-img]: http://cultofmartians.com/assets/badges/badge.svg
 [cult]: http://cultofmartians.com/done.html
 
@@ -96,4 +94,4 @@ server.type('CHANGE_NAME', {
 server.listen()
 ```
 
-[documentation]: https://github.com/logux/logux
+[documentation]: https://logux.org/

package/add-sync-map/index.d.ts

@@ -3,28 +3,29 @@ import type {
   SyncMapChangeAction,
   SyncMapCreateAction,
   SyncMapDeleteAction,
-  SyncMapValues,
-  SyncMapTypes
+  SyncMapTypes,
+  SyncMapValues
 } from '@logux/actions'
+
 import type { BaseServer, ServerMeta } from '../base-server/index.js'
 import type { Context } from '../context/index.js'
 
 declare const WITH_TIME: unique symbol
 
 export type WithTime<Value extends SyncMapTypes | SyncMapTypes[]> = {
-  value: Value
   time: number
+  value: Value
   [WITH_TIME]: true
 }
 
 export type WithoutTime<Value extends SyncMapTypes | SyncMapTypes[]> = {
-  value: Value
   time: undefined
+  value: Value
   [WITH_TIME]: false
 }
 
 export type SyncMapData<Value extends SyncMapValues> = { id: string } & {
-  [Key in keyof Value]: WithTime<Value[Key]> | WithoutTime<Value[Key]>
+  [Key in keyof Value]: WithoutTime<Value[Key]> | WithTime<Value[Key]>
 }
 
 /**
@@ -59,7 +60,7 @@ interface SyncMapActionFilter<Value extends SyncMapValues> {
     ctx: Context,
     action: SyncMapCreateAction<Value> | SyncMapDeleteAction,
     meta: ServerMeta
-  ): Promise<boolean> | boolean
+  ): boolean | Promise<boolean>
 }
 
 interface SyncMapOperations<Value extends SyncMapValues> {
@@ -67,20 +68,21 @@ interface SyncMapOperations<Value extends SyncMapValues> {
     ctx: Context,
     id: string,
     action:
-      | SyncMapCreateAction
+      | LoguxSubscribeAction
       | SyncMapChangeAction
-      | SyncMapDeleteAction
-      | LoguxSubscribeAction,
+      | SyncMapCreateAction
+      | SyncMapDeleteAction,
     meta: ServerMeta
-  ): Promise<boolean> | boolean
+  ): boolean | Promise<boolean>
 
-  load?(
+  change?(
     ctx: Context,
     id: string,
-    since: number | undefined,
-    action: LoguxSubscribeAction,
+    fields: Partial<Value>,
+    time: number,
+    action: SyncMapChangeAction<Value>,
     meta: ServerMeta
-  ): Promise<SyncMapData<Value> | false> | SyncMapData<Value> | false 
+  ): boolean | Promise<boolean | void> | void 
 
   create?(
     ctx: Context,
@@ -89,23 +91,22 @@ interface SyncMapOperations<Value extends SyncMapValues> {
     time: number,
     action: SyncMapCreateAction<Value>,
     meta: ServerMeta
-  ): Promise<void | boolean> | void | boolean
+  ): boolean | Promise<boolean | void> | void
 
-  change?(
+  delete?(
     ctx: Context,
     id: string,
-    fields: Partial<Value>,
-    time: number,
-    action: SyncMapChangeAction<Value>,
+    action: SyncMapDeleteAction,
     meta: ServerMeta
-  ): Promise<void | boolean> | void | boolean
+  ): boolean | Promise<boolean | void> | void
 
-  delete?(
+  load?(
     ctx: Context,
     id: string,
-    action: SyncMapDeleteAction,
+    since: number | undefined,
+    action: LoguxSubscribeAction,
     meta: ServerMeta
-  ): Promise<void | boolean> | void | boolean
+  ): false | Promise<false | SyncMapData<Value>> | SyncMapData<Value>
 }
 
 interface SyncMapFilterOperations<Value extends SyncMapValues> {
@@ -114,22 +115,22 @@ interface SyncMapFilterOperations<Value extends SyncMapValues> {
     filter: Partial<Value> | undefined,
     action: LoguxSubscribeAction,
     meta: ServerMeta
-  ): Promise<boolean> | boolean
+  ): boolean | Promise<boolean>
 
-  initial(
+  actions?(
     ctx: Context,
     filter: Partial<Value> | undefined,
-    since: number | undefined,
     action: LoguxSubscribeAction,
     meta: ServerMeta
-  ): Promise<SyncMapData<Value>[]> | SyncMapData<Value>[]
+  ): Promise<SyncMapActionFilter<Value>> | SyncMapActionFilter<Value> | void
 
-  actions?(
+  initial(
     ctx: Context,
     filter: Partial<Value> | undefined,
+    since: number | undefined,
     action: LoguxSubscribeAction,
     meta: ServerMeta
-  ): Promise<SyncMapActionFilter<Value>> | SyncMapActionFilter<Value> | void
+  ): Promise<SyncMapData<Value>[]> | SyncMapData<Value>[]
 }
 
 /**

package/add-sync-map/index.js

@@ -1,7 +1,7 @@
 const WITH_TIME = Symbol('WITH_TIME')
 
 export function ChangedAt(value, time) {
-  return { value, time, [WITH_TIME]: true }
+  return { time, value, [WITH_TIME]: true }
 }
 
 export function NoConflictResolution(value) {
@@ -11,7 +11,7 @@ export function NoConflictResolution(value) {
 async function addFinished(server, ctx, type, action, meta) {
   await server.process(
     { ...action, type },
-    { time: meta.time, excludeClients: [ctx.clientId] }
+    { excludeClients: [ctx.clientId], time: meta.time }
   )
 }
 
@@ -71,9 +71,9 @@ async function sendMap(server, changedType, data, since) {
     }
     await server.process(
       {
-        type: changedType,
+        fields,
         id,
-        fields
+        type: changedType
       },
       changedMeta
     )

package/base-server/hello.html

@@ -19,7 +19,7 @@
   </style>
 </head>
   <body>
-    <a href="https://logux.io/">
+    <a href="https://logux.org/">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 117">
         <g fill="none" fill-rule="evenodd">
           <path d="M-1 0h78v117H-1z" />