selfsdk 0.0.157 → 0.0.158

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 591ba1fdd4152ea5346667256345644f78ddcc5307426f59d90bc2a7ac61cdcc
-  data.tar.gz: 3e565f40abf9e8df6fdde236ba92bc65f780cbcc7554fc26316cc52b54dc2d69
+  metadata.gz: 30ec6ed6d4c41d8a37d049f8d03a4fe91976ae19caf1eb3f8feb5418b12ed30a
+  data.tar.gz: 3f9262518a31f02865f2e77bbfa125c3fa23f8b56606cb0c3899ad9b1f5d4521
 SHA512:
-  metadata.gz: 231048c700a31b8e0664a20b4afb212fd5f4b3da8cc91b02b18296153cd6e0d5c137d902f95133b32bf288bae815598270c0f0caf1271f791e34b9f4de79a115
-  data.tar.gz: c44c480f4c5181e11c310345a8c81f99b17867877760edf927ab6bdcf3dc46805487533febca0e5f4208615c9a65fac463ee48ec73a02764bda52be2749e54f8
+  metadata.gz: 86a6cbcd6a449683ae5cf16cfc9a6c55b8a284fe08ccfe9c038a9f75c14722cab0bc29bfff2797a62653382b7da7d3875eda66a700e68983ae45e0dce625983a
+  data.tar.gz: 3bd97ff20641571543c6f621472f6f736b067003c72fcd99a4f9c342bf996c4093c9291b54c122dc770fe9a03817c18efb8486a35d8531fe2a01d375010fb478

data/lib/crypto.rb

@@ -8,7 +8,7 @@ module SelfSDK
       @client = client
       @device = device
       @storage_key = storage_key
-      @storage_folder = storage_folder
+      @storage_folder = "#{storage_folder}/#{@client.jwt.key_id}"
 
       if File.exist?(account_path)
         # 1a) if alice's account file exists load the pickle from the file

data/lib/messaging.rb

@@ -45,13 +45,17 @@ module SelfSDK
       @timeout = 120 # seconds
       @device_id = options.fetch(:device_id, DEFAULT_DEVICE)
       @auto_reconnect = options.fetch(:auto_reconnect, DEFAULT_AUTO_RECONNECT)
-      @storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
+      @raw_storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
+      @storage_dir = "#{@raw_storage_dir}/apps/#{@jwt.id}/devices/#{@device_id}"
+      FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       @offset_file = "#{@storage_dir}/#{@jwt.id}:#{@device_id}.offset"
       @offset = read_offset
+      migrate_old_storage_format
 
-      FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       unless options.include? :no_crypto
-        @encryption_client = Crypto.new(@client, @device_id, @storage_dir, storage_key)
+        crypto_path = "#{@storage_dir}/keys"
+        FileUtils.mkdir_p crypto_path unless File.exist? crypto_path
+        @encryption_client = Crypto.new(@client, @device_id, crypto_path, storage_key)
       end
 
       if options.include? :ws
@@ -439,15 +443,36 @@ module SelfSDK
       return 0 unless File.exist? @offset_file
 
       File.open(@offset_file, 'rb') do |f|
-        return f.read.unpack('q')[0]
+        return f.read.to_i
       end
     end
 
     def write_offset(offset)
       File.open(@offset_file, 'wb') do |f|
         f.flock(File::LOCK_EX)
-        f.write([offset].pack('q'))
+        f.write([offset.to_s.rjust(19, "0")])
+      end
+    end
+
+    def migrate_old_storage_format
+      # Move the offset file
+      old_offset_file = "#{@raw_storage_dir}/#{@jwt.id}:#{@device_id}.offset"
+      if File.file?(old_offset_file)
+        File.open(old_offset_file, 'rb') do |f|
+          offset = f.read.unpack('q')[0]
+          write_offset(offset)
+        end
+        File.delete(old_offset_file)
+      end
+      
+      # Move all pickle files
+      crypto_path = "#{@storage_dir}/keys/#{@jwt.key_id}"
+      FileUtils.mkdir_p crypto_path unless File.exist? crypto_path
+      Dir[File.join(@raw_storage_dir, "*.pickle")].each do |file|
+        filename = File.basename(file, ".pickle")
+        File.rename file, "#{crypto_path}/#{filename}.pickle"
       end
+        
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.157
+  version: 0.0.158
 platform: ruby
 authors:
 - Aldgate Ventures