@shaxpir/duiduidui-models 1.4.7 → 1.4.9

package/dist/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/// <reference path="../decs.d.ts" />
 __exportStar(require("./models"), exports);
 __exportStar(require("./repo"), exports);
 __exportStar(require("./util"), exports);

package/dist/models/Billing.d.ts

@@ -1,4 +1,5 @@
 import { Doc } from '@shaxpir/sharedb/lib/client';
+import { MultiTime } from '@shaxpir/shaxpir-common';
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 export interface BillingPayload {
@@ -10,7 +11,7 @@ export interface BillingBody extends ContentBody {
 }
 export declare class Billing extends Content {
     static makeBillingId(userId: ContentId): ContentId;
-    static create(userId: ContentId, payload: BillingPayload): Billing;
+    static create(userId: ContentId, payload: BillingPayload, createdAt?: MultiTime): Billing;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): BillingPayload;
 }

package/dist/models/Billing.js

@@ -9,8 +9,10 @@ class Billing extends Content_1.Content {
     static makeBillingId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.BILLING);
     }
-    static create(userId, payload) {
+    static create(userId, payload, createdAt) {
         const now = shaxpir_common_1.MultiClock.now();
+        // If the createdAt time is not provided, use the current time
+        createdAt ??= now;
         const billingId = Billing.makeBillingId(userId);
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
@@ -18,8 +20,8 @@ class Billing extends Content_1.Content {
                 kind: ContentKind_1.ContentKind.BILLING,
                 id: billingId,
                 owner: userId,
-                created_at: now,
-                updated_at: now
+                created_at: createdAt,
+                updated_at: createdAt
             },
             payload
         });

package/dist/models/Manifest.d.ts

@@ -34,7 +34,7 @@ export interface ManifestPayload {
 export declare class Manifest extends Model {
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     static makeManifestId(userId: ContentId): ContentId;
-    static create(userId: ContentId): Manifest;
+    static create(userId: ContentId, createdAt?: SingleTime): Manifest;
     get meta(): ManifestMeta;
     get owner(): ContentId;
     canUserView(userId: ContentId): boolean;

package/dist/models/Manifest.js

@@ -13,16 +13,16 @@ class Manifest extends Model_1.Model {
     static makeManifestId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.MANIFEST);
     }
-    static create(userId) {
+    static create(userId, createdAt) {
         const now = shaxpir_common_1.Time.utc();
+        // If the createdAt time is not provided, use the current time
+        const createdTime = createdAt ?? { utc_time: now };
         const manifestId = Manifest.makeManifestId(userId);
         return repo_1.ShareSyncFactory.get().createManifest({
             meta: {
                 kind: ContentKind_1.ContentKind.MANIFEST,
                 ref: manifestId,
-                updated_at: {
-                    utc_time: now
-                },
+                updated_at: createdTime,
                 owner: userId
             },
             payload: {

package/dist/models/User.js

@@ -28,7 +28,7 @@ class User extends Content_1.Content {
                 id: userId,
                 owner: userId,
                 created_at: createdAt,
-                updated_at: now
+                updated_at: createdAt
             },
             payload: payload
         });

package/dist/models/Workspace.d.ts

@@ -28,7 +28,7 @@ export declare class Workspace extends Content {
     get payload(): WorkspacePayload;
     getGlobalTags(): TagFilterConfig;
     static makeWorkspaceId(userId: ContentId): ContentId;
-    static create(userId: ContentId, deviceId: ContentId): Workspace;
+    static create(userId: ContentId, payload: WorkspacePayload): Workspace;
     get sessions(): ArrayView<MultiTime>;
     get devices(): ArrayView<ContentId>;
     acquireSessionsFromDate(sessionId: ContentId, localDate: CompactDate): Promise<Session[]>;

package/dist/models/Workspace.js

@@ -24,7 +24,7 @@ class Workspace extends Content_1.Content {
     static makeWorkspaceId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.WORKSPACE);
     }
-    static create(userId, deviceId) {
+    static create(userId, payload) {
         const now = shaxpir_common_1.MultiClock.now();
         const workspaceId = Workspace.makeWorkspaceId(userId);
         return repo_1.ShareSyncFactory.get().createContent({
@@ -36,12 +36,7 @@ class Workspace extends Content_1.Content {
                 created_at: now,
                 updated_at: now
             },
-            payload: {
-                devices: [deviceId],
-                journey: {},
-                global_tags: {},
-                sessions: []
-            }
+            payload
         });
     }
     get sessions() {

package/dist/repo/ShareSync.d.ts

@@ -21,6 +21,8 @@ export interface ShareSyncOptions {
     pingInterval?: number;
     encryptionKey?: string;
     webSocketConstructor?: any;
+    enableDurableStore?: boolean;
+    storageFactory?: () => Promise<any>;
 }
 export declare class ShareSyncFactory {
     private static INSTANCE;
@@ -40,7 +42,11 @@ export declare class ShareSync {
     private _socket;
     private _connection;
     private _listener;
+    private _storage;
+    private _durableStore;
+    private _storageFactory?;
     constructor(encryption: Encryption, options: ShareSyncOptions);
+    private initializeDurableStore;
     isDebug(): boolean;
     isOnline(): boolean;
     ping(): void;

package/dist/repo/ShareSync.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShareSync = exports.ShareSyncFactory = exports.ShareSyncDisposalStrategy = void 0;
 const client_1 = __importStar(require("@shaxpir/sharedb/lib/client"));
+const durable_store_1 = __importDefault(require("@shaxpir/sharedb/lib/client/durable-store"));
 const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const reconnecting_websocket_1 = __importDefault(require("reconnecting-websocket"));
 const models_1 = require("../models");
@@ -78,9 +79,10 @@ class ShareSync {
         shareSync._debug = options.debug;
         shareSync._disposalStrategy = options.disposalStrategy;
         shareSync._opErrorCallback = options.opErrorCallback;
-        shareSync._hasDurableStore = options.namespace && options.namespace.length > 0;
+        shareSync._hasDurableStore = options.enableDurableStore === true && options.namespace && options.namespace.length > 0;
         shareSync._useDurableStoreEncryption = options.encryptionKey && options.encryptionKey.length > 0;
         shareSync._durableStoreEncryptionKey = options.encryptionKey;
+        shareSync._storageFactory = options.storageFactory;
         // Create and configure the socket.
         if (options.webSocketConstructor) {
             shareSync._socket = new reconnecting_websocket_1.default(options.urlProvider, [], { WebSocket: options.webSocketConstructor });
@@ -109,39 +111,21 @@ class ShareSync {
             updateSocketIsOpen();
             shareSync._listener.onSocketEvent('error', event);
         });
-        // Create the ShareDB connection from the socket
+        // Create the ShareDB connection from the socket (without DurableStore initially)
+        shareSync._connection = new client_1.Connection(shareSync._socket);
+        // Initialize DurableStore asynchronously if enabled
         if (shareSync._hasDurableStore) {
-            shareSync._connection = new client_1.Connection(shareSync._socket, {
-                durableStore: {
-                    namespace: options.namespace,
-                    debug: options.debug,
-                    useEncryption: shareSync._useDurableStoreEncryption,
-                    encryptionCallback: (plaintext) => {
-                        return encryption.encrypt(plaintext, shareSync._durableStoreEncryptionKey);
-                    },
-                    decryptionCallback: (cyphertext) => {
-                        return encryption.decrypt(cyphertext, shareSync._durableStoreEncryptionKey);
-                    },
-                    onReadyCallback: options.onReadyCallback,
-                    opErrorCallback: options.opErrorCallback,
-                    // Use the 'docData.meta.updated_at.utc_time' field (which is universal to all Model subclasses) as the 'version'
-                    // identifier that we use when determining if the doc in the DurableStore is up-to-date. This field won't yet
-                    // exist when the doc is newly created (since the 'doc.data' will be undefined), so in that case, we'll return
-                    // null as the version string, which will work correctly with the versioning semantics of the DurableStore.
-                    extVersionDecoder: (docData) => {
-                        if (docData &&
-                            docData.meta &&
-                            docData.meta.updated_at &&
-                            docData.meta.updated_at.utc_time) {
-                            return docData.meta.updated_at.utc_time;
-                        }
-                        return null;
-                    }
-                }
+            shareSync.initializeDurableStore(options).catch((error) => {
+                console.error('Failed to initialize DurableStore:', error);
+                shareSync._opErrorCallback && shareSync._opErrorCallback(error);
             });
         }
-        else {
-            shareSync._connection = new client_1.Connection(shareSync._socket);
+        else if (options.onReadyCallback) {
+            // If there is no DurableStore, then we can call the onReadyCallback now. However,
+            // we have to use setTimeout to invoke it, because the callback will probably want
+            // to retrieve the ShareSync instance from the factory, and because the constructor
+            // hasn't actually finished yet, the INSTANCE pointer hasn't quite been assigned yet.
+            setTimeout(options.onReadyCallback, 1);
         }
         shareSync._connection.on('error', (err) => {
             console.error(`ShareSync connection error: ${err}\n  Error code: ${err.code}\n  Error message: ${err.message}\n  Error stack: ${err.stack}\n`);
@@ -151,12 +135,43 @@ class ShareSync {
         if (options.pingInterval && typeof (options.pingInterval) === 'number') {
             setInterval(() => { shareSync.ping(); }, options.pingInterval);
         }
-        if (!shareSync._hasDurableStore && !!options.onReadyCallback) {
-            // If there is no DurableStore, then we can call the onReadyCallback now. However,
-            // we have to use setTimeout to invoke it, because the callback will probably want
-            // to retrieve the ShareSync instance from the factory, and because the constructor
-            // hasn't actually finished yet, the INSTANCE pointer hasn't quite been assigned yet.
-            setTimeout(options.onReadyCallback, 1);
+    }
+    async initializeDurableStore(options) {
+        try {
+            // Create storage implementation if factory is provided
+            if (this._storageFactory) {
+                this._storage = await this._storageFactory();
+            }
+            // Create DurableStore with the storage
+            if (this._storage) {
+                this._durableStore = new durable_store_1.default(this._storage, {
+                    debug: this._debug,
+                    // Version decoder for determining document freshness
+                    // Uses the 'docData.meta.updated_at.utc_time' field (universal to all Model subclasses)
+                    extVersionDecoder: (docData) => {
+                        if (docData &&
+                            docData.meta &&
+                            docData.meta.updated_at &&
+                            docData.meta.updated_at.utc_time) {
+                            return docData.meta.updated_at.utc_time;
+                        }
+                        return null;
+                    }
+                });
+                // Attach DurableStore to connection
+                this._connection.useDurableStore(this._durableStore);
+                // Call ready callback once DurableStore is initialized
+                if (options.onReadyCallback) {
+                    options.onReadyCallback();
+                }
+            }
+            else {
+                console.warn('DurableStore enabled but no storage factory provided');
+            }
+        }
+        catch (error) {
+            console.error('Failed to initialize DurableStore:', error);
+            throw error;
         }
     }
     isDebug() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"
@@ -16,7 +16,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@shaxpir/sharedb": "^5.3.0",
+    "@shaxpir/sharedb": "^6.0.3",
     "@shaxpir/shaxpir-common": "1.3.0",
     "ot-json1": "1.0.1",
     "ot-text-unicode": "4.0.0",